summaryrefslogtreecommitdiff
path: root/lib/api
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-12-08 22:34:03 +0100
committerDouwe Maan <douwe@gitlab.com>2015-12-08 22:34:03 +0100
commit8fb49a4b7005d7e57bb84d6fe5db97ff39d1064b (patch)
tree38118628101e0b9281a07c295d15d0c9f075197b /lib/api
parentf39ff54290abe224b0b79accc0da48c1cd2d2109 (diff)
parente616739e2fae12e5358d2cea40089a51468d9b4a (diff)
downloadgitlab-ce-8fb49a4b7005d7e57bb84d6fe5db97ff39d1064b.tar.gz
Merge branch 'master' into merge-if-green
# Conflicts: # app/views/projects/merge_requests/widget/_heading.html.haml # app/views/projects/merge_requests/widget/open/_accept.html.haml
Diffstat (limited to 'lib/api')
-rw-r--r--lib/api/groups.rb12
1 files changed, 12 insertions, 0 deletions
diff --git a/lib/api/groups.rb b/lib/api/groups.rb
index 024aeec2e14..1a14d870a4a 100644
--- a/lib/api/groups.rb
+++ b/lib/api/groups.rb
@@ -65,6 +65,18 @@ module API
DestroyGroupService.new(group, current_user).execute
end
+ # Get a list of projects in this group
+ #
+ # Example Request:
+ # GET /groups/:id/projects
+ get ":id/projects" do
+ group = find_group(params[:id])
+ projects = group.projects
+ projects = filter_projects(projects)
+ projects = paginate projects
+ present projects, with: Entities::Project
+ end
+
# Transfer a project to the Group namespace
#
# Parameters: