diff options
| author | Winnie Hellmann <winnie@gitlab.com> | 2017-12-07 01:03:01 +0300 |
|---|---|---|
| committer | Winnie Hellmann <winnie@gitlab.com> | 2017-12-07 01:03:01 +0300 |
| commit | 5773e4feedc062ed1f4b534f84b8c210a7a0e491 (patch) | |
| tree | e0039e1665b37ea76308ad27080e061265e80695 /app/controllers/projects_controller.rb | |
| parent | 3141105ec49dd13434c2e8964b55427a764c7287 (diff) | |
| parent | 0671211d44b36627787f44ceb4f95a6e40c33bf3 (diff) | |
Merge branch '10-2-stable-patch-4' into '10-2-stable'
Prepare 10.2.4 security release
See merge request gitlab/gitlabhq!2241
Diffstat (limited to 'app/controllers/projects_controller.rb')
| -rw-r--r-- | app/controllers/projects_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 2a473ec0cec..800e3cec762 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -271,7 +271,7 @@ class ProjectsController < Projects::ApplicationController return render 'projects/no_repo' unless @project.repository_exists? render 'projects/empty' if @project.empty_repo? else - if @project.wiki_enabled? + if can?(current_user, :read_wiki, @project) @project_wiki = @project.wiki @wiki_home = @project_wiki.find_page('home', params[:version_id]) elsif @project.feature_available?(:issues, current_user) |