summaryrefslogtreecommitdiff
path: root/lib/api
diff options
context:
space:
mode:
authorPatricio Cano <suprnova32@gmail.com>2015-09-16 19:52:57 -0500
committerPatricio Cano <suprnova32@gmail.com>2015-09-16 19:52:57 -0500
commit1ef2ce95d507c3d21598f26dd8a0e77dfc3c33cf (patch)
treedc7a80b0f77f98e9f1a6898644f4961cac2c2d60 /lib/api
parent4c98357f16b1acfa793d8a5b28c7147e21f20356 (diff)
parentc99473e57ca90f95c4e31fc1582fb94731257442 (diff)
downloadgitlab-ce-1ef2ce95d507c3d21598f26dd8a0e77dfc3c33cf.tar.gz
Merge branch 'master' into notification-levels
Diffstat (limited to 'lib/api')
-rw-r--r--lib/api/services.rb10
1 files changed, 10 insertions, 0 deletions
diff --git a/lib/api/services.rb b/lib/api/services.rb
index 73645cedea4..d170b3067ed 100644
--- a/lib/api/services.rb
+++ b/lib/api/services.rb
@@ -49,6 +49,16 @@ module API
end
end
end
+
+ # Get <service_slug> service settings for project
+ #
+ # Example Request:
+ #
+ # GET /project/:id/services/gitlab-ci
+ #
+ get ':id/services/:service_slug' do
+ present project_service
+ end
end
end
end