summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzegorz@gitlab.com>2018-01-04 08:38:19 +0000
committerGrzegorz Bizon <grzegorz@gitlab.com>2018-01-04 08:38:19 +0000
commit9ca898c4ed331f64b7be2d5a9c8e960097058548 (patch)
treebe69b175a97785fc3ee4813bb241e3068c9ea12c /lib
parentfb583c4b1839af16c50e27105a300695aa50bcad (diff)
parentcf8f09636b766c2df2ff48c078c0d8a6657bf4dd (diff)
downloadgitlab-ce-9ca898c4ed331f64b7be2d5a9c8e960097058548.tar.gz
Merge branch 'rd-api-request-to-edit-wiki-page-fails-when-project-belongs-to-group' into 'master'
Fix API endpoints to edit wiki pages where project belongs to a group Closes #40453 See merge request gitlab-org/gitlab-ce!16170
Diffstat (limited to 'lib')
-rw-r--r--lib/api/helpers.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb
index 9ba15893f55..8ad4b2ecbf3 100644
--- a/lib/api/helpers.rb
+++ b/lib/api/helpers.rb
@@ -69,7 +69,7 @@ module API
end
def wiki_page
- page = user_project.wiki.find_page(params[:slug])
+ page = ProjectWiki.new(user_project, current_user).find_page(params[:slug])
page || not_found!('Wiki Page')
end