summaryrefslogtreecommitdiff
path: root/lib/api/services.rb
diff options
context:
space:
mode:
authorHan Loong Liauw <hanloongliauw@gmail.com>2015-10-17 09:32:31 +1100
committerHan Loong Liauw <hanloongliauw@gmail.com>2015-10-17 09:32:31 +1100
commit02e8beaa0b83a343752ebf60e4fca4482c17f9e3 (patch)
treee00847b274daa7fa03fd7a4647154cc2e4d98e85 /lib/api/services.rb
parent0bea5ced8bf4c9306f8f8e912313731a43d16f4c (diff)
parentc856a7a5934fba13598be09507c2090888f57a39 (diff)
downloadgitlab-ce-02e8beaa0b83a343752ebf60e4fca4482c17f9e3.tar.gz
Merge branch 'master' into remove-forks-from-projects-settings
Diffstat (limited to 'lib/api/services.rb')
-rw-r--r--lib/api/services.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/services.rb b/lib/api/services.rb
index 6727e80ac1e..203f04a6259 100644
--- a/lib/api/services.rb
+++ b/lib/api/services.rb
@@ -57,7 +57,7 @@ module API
# GET /project/:id/services/gitlab-ci
#
get ':id/services/:service_slug' do
- present project_service
+ present project_service, with: Entities::ProjectService, include_passwords: current_user.is_admin?
end
end
end