diff options
| author | Winnie Hellmann <winnie@gitlab.com> | 2017-12-11 12:07:57 +0000 |
|---|---|---|
| committer | Winnie Hellmann <winnie@gitlab.com> | 2017-12-11 12:07:57 +0000 |
| commit | 1eff1bd385a28ccde7d0dc3a991c499ada1a63bd (patch) | |
| tree | b57fbf22b38f0abe59219091842428b4a5358e9c /app/controllers | |
| parent | 689bc9ea6db102006b548e6176125157955c7f2b (diff) | |
| parent | f71e48a0d09597e19aa629e4c7d42035ca08d852 (diff) | |
| download | gitlab-ce-1eff1bd385a28ccde7d0dc3a991c499ada1a63bd.tar.gz | |
Merge branch 'mk-pick-10-2-4-security-fixes' into 'master'
Pick 10.2.4 security fixes into master
See merge request gitlab-org/gitlab-ce!15821
Diffstat (limited to 'app/controllers')
| -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 3882fa4791d..8e9d6766d80 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -272,7 +272,7 @@ class ProjectsController < Projects::ApplicationController 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) |