summaryrefslogtreecommitdiff
path: root/lib/api/services.rb
diff options
context:
space:
mode:
authorValery Sizov <vsv2711@gmail.com>2015-10-14 14:15:34 +0300
committerValery Sizov <vsv2711@gmail.com>2015-10-14 14:15:34 +0300
commit4117d9b310cbcdc1967163273ad63495542046cb (patch)
treeba28553726f93f961044b82589cc90088f87749c /lib/api/services.rb
parent82da19cecd6390d2372bad36da0a9f89b21abb38 (diff)
parent024e34e94d973842cf02d9177e9ec52bd587ceee (diff)
downloadgitlab-ce-cernvcs_hide_passwrd.tar.gz
Merge branch 'feature/api_hide_service_password' of gitlab.com:cernvcs/gitlab-cecernvcs_hide_passwrd
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