diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-03-16 11:51:49 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-03-16 11:51:49 +0300 |
| commit | 50692556815dc7bc4ee8aa3175cf22226739a470 (patch) | |
| tree | d933b701ea6f67de24231f34d2926262e1f3356e | |
| parent | 68e64a5b44b7a0f540214ee8a3ca36ffcdb4fc6c (diff) | |
| parent | 08d3a40c3191add17ce3546f70fda449d367d3cb (diff) | |
Merge branch 'fix-project-without-repo-and-wiki' into 'master'
Fix projects without repo and wiki
Closes #29542
See merge request !9956
| -rw-r--r-- | app/controllers/projects_controller.rb | 5 | ||||
| -rw-r--r-- | spec/controllers/projects_controller_spec.rb | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index e4fd53eed29..395a8bffe92 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -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 diff --git a/spec/controllers/projects_controller_spec.rb b/spec/controllers/projects_controller_spec.rb index a1ec41322ad..a88ffc1ea6a 100644 --- a/spec/controllers/projects_controller_spec.rb +++ b/spec/controllers/projects_controller_spec.rb @@ -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 |