Merge branch 'fix-project-without-repo-and-wiki' into 'master'
Fix projects without repo and wiki Closes #29542 See merge request !9956
This commit is contained in:
commit
5069255681
|
@ -267,8 +267,9 @@ class ProjectsController < Projects::ApplicationController
|
|||
@project_wiki = @project.wiki
|
||||
@wiki_home = @project_wiki.find_page('home', params[:version_id])
|
||||
elsif @project.feature_available?(:issues, current_user)
|
||||
@issues = issues_collection
|
||||
@issues = @issues.page(params[:page])
|
||||
@issues = issues_collection.page(params[:page])
|
||||
@collection_type = 'Issue'
|
||||
@issuable_meta_data = issuable_meta_data(@issues, @collection_type)
|
||||
end
|
||||
|
||||
render :show
|
||||
|
|
|
@ -78,10 +78,12 @@ describe ProjectsController do
|
|||
|
||||
it 'shows issues list page if wiki is disabled' do
|
||||
project.project_feature.update_attribute(:wiki_access_level, ProjectFeature::DISABLED)
|
||||
create(:issue, project: project)
|
||||
|
||||
get :show, namespace_id: project.namespace, id: project
|
||||
|
||||
expect(response).to render_template('projects/issues/_issues')
|
||||
expect(assigns(:issuable_meta_data)).not_to be_nil
|
||||
end
|
||||
|
||||
it 'shows customize workflow page if wiki and issues are disabled' do
|
||||
|
|
Loading…
Reference in New Issue