diff options
author | Joshua Lambert <joshua@gitlab.com> | 2017-03-16 18:45:46 +0000 |
---|---|---|
committer | Joshua Lambert <joshua@gitlab.com> | 2017-03-16 18:45:46 +0000 |
commit | d2f209a60b2ea2d889eaf5142c8d09ba0848a4c3 (patch) | |
tree | 62810ea2d1f8aa1d131e31ad667c39ea0a6d466a /lib/api/services.rb | |
parent | 83259875939958c6288066a3a4e59a5062b4c9e6 (diff) | |
parent | ce5d1b6fd7ed1aea2d2a675414ba81be624f2bf1 (diff) | |
download | gitlab-ce-29142-add-prometheus-integration-documentation.tar.gz |
Merge branch 'master' into '29142-add-prometheus-integration-documentation'29142-add-prometheus-integration-documentation
# Conflicts:
# doc/install/requirements.md
Diffstat (limited to 'lib/api/services.rb')
-rw-r--r-- | lib/api/services.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/api/services.rb b/lib/api/services.rb index 5aa2f5eba7b..be614bb8dc0 100644 --- a/lib/api/services.rb +++ b/lib/api/services.rb @@ -604,7 +604,10 @@ module API ] }.freeze - resource :projects do + params do + requires :id, type: String, desc: 'The ID of a project' + end + resource :projects, requirements: { id: %r{[^/]+} } do before { authenticate! } before { authorize_admin_project } @@ -692,7 +695,7 @@ module API params do requires :id, type: String, desc: 'The ID of a project' end - resource :projects do + resource :projects, requirements: { id: %r{[^/]+} } do desc "Trigger a slash command for #{service_slug}" do detail 'Added in GitLab 8.13' end |