summaryrefslogtreecommitdiff
path: root/lib/api
diff options
context:
space:
mode:
authorZeger-Jan van de Weg <zegerjan@gitlab.com>2016-03-14 20:08:02 +0100
committerZeger-Jan van de Weg <zegerjan@gitlab.com>2016-03-14 20:08:02 +0100
commit88f8d3a4d6521d1001bcea83c2fb7b7c4fe15f37 (patch)
tree6396220c786e65563c8d0eb4dc1a88a60d3636c8 /lib/api
parent76eeb316df2f256d0d3c41d97421f709a21a02a8 (diff)
parentb782e7c9732275175d79b485fcddc85e575d48dd (diff)
downloadgitlab-ce-88f8d3a4d6521d1001bcea83c2fb7b7c4fe15f37.tar.gz
Merge branch 'master' into 4009-external-users
Diffstat (limited to 'lib/api')
-rw-r--r--lib/api/entities.rb7
-rw-r--r--lib/api/projects.rb27
2 files changed, 34 insertions, 0 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 5b5b8bd044b..7204dca34ba 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -144,6 +144,9 @@ module API
expose :id, :title, :file_name
expose :author, using: Entities::UserBasic
expose :updated_at, :created_at
+
+ # TODO (rspeicher): Deprecated; remove in 9.0
+ expose(:expires_at) { |snippet| nil }
end
class ProjectEntity < Grape::Entity
@@ -243,6 +246,10 @@ module API
end
end
+ class ProjectGroupLink < Grape::Entity
+ expose :id, :project_id, :group_id, :group_access
+ end
+
class Namespace < Grape::Entity
expose :id, :path, :kind
end
diff --git a/lib/api/projects.rb b/lib/api/projects.rb
index 6067c8b4a5e..6fcb5261e40 100644
--- a/lib/api/projects.rb
+++ b/lib/api/projects.rb
@@ -290,6 +290,33 @@ module API
end
end
+ # Share project with group
+ #
+ # Parameters:
+ # id (required) - The ID of a project
+ # group_id (required) - The ID of a group
+ # group_access (required) - Level of permissions for sharing
+ #
+ # Example Request:
+ # POST /projects/:id/share
+ post ":id/share" do
+ authorize! :admin_project, user_project
+ required_attributes! [:group_id, :group_access]
+
+ unless user_project.allowed_to_share_with_group?
+ return render_api_error!("The project sharing with group is disabled", 400)
+ end
+
+ link = user_project.project_group_links.new
+ link.group_id = params[:group_id]
+ link.group_access = params[:group_access]
+ if link.save
+ present link, with: Entities::ProjectGroupLink
+ else
+ render_api_error!(link.errors.full_messages.first, 409)
+ end
+ end
+
# Upload a file
#
# Parameters: