summaryrefslogtreecommitdiff
path: root/lib/api/helpers.rb
diff options
context:
space:
mode:
authorMatija Čupić <matteeyah@gmail.com>2018-01-04 23:38:13 +0100
committerMatija Čupić <matteeyah@gmail.com>2018-01-04 23:38:13 +0100
commit9c9f7dc639768a0d6b930ec11c050a1333df934e (patch)
tree7a54287bb3e8eec9a57223bdace347de72beb936 /lib/api/helpers.rb
parent6fb4a533b74c861a1e533604da462efb6d309de0 (diff)
parent6f1b4dc76b4619f538b7216ad3a10ca9336d0c2b (diff)
downloadgitlab-ce-9c9f7dc639768a0d6b930ec11c050a1333df934e.tar.gz
Merge branch 'master' into 41249-clearing-the-cache
Diffstat (limited to 'lib/api/helpers.rb')
-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