diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2017-03-15 14:38:47 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-03-15 14:42:02 +0800 |
| commit | 668a5b9fe1712ba082e4b0ba6d6bf54bc5691a49 (patch) | |
| tree | 7448364bf73bb84deed658ece2dc3b75234de749 | |
| parent | 253b61d2a03fe04877cedb88260dbb69f59e7e89 (diff) | |
| download | gitlab-ce-668a5b9fe1712ba082e4b0ba6d6bf54bc5691a49.tar.gz | |
Fix projects without repo and wiki
When repo and wiki are disabled for a project,
we're showing issues so we'll need to set @issuable_meta_data
otherwise it would be giving nil errors. See:
https://sentry.gitlap.com/gitlab/staginggitlabcom/issues/23106/
| -rw-r--r-- | app/controllers/projects_controller.rb | 5 | ||||
| -rw-r--r-- | spec/controllers/projects_controller_spec.rb | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 3e2015b7d5e..16e702073b2 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..a52d61b2357 100644 --- a/spec/controllers/projects_controller_spec.rb +++ b/spec/controllers/projects_controller_spec.rb @@ -78,6 +78,7 @@ 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 |