Commit fe2b98ab authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'remove-group-id' into 'master'

Remove Group#owner_id from API

For #1943

See merge request !1537
parents 000865f1 24d939af
...@@ -58,6 +58,7 @@ v 7.8.0 (unreleased) ...@@ -58,6 +58,7 @@ v 7.8.0 (unreleased)
- Add quick help links to the GitLab pricing and feature comparison pages. - Add quick help links to the GitLab pricing and feature comparison pages.
- Fix duplicate authorized applications in user profile and incorrect application client count in admin area. - Fix duplicate authorized applications in user profile and incorrect application client count in admin area.
- Make sure Markdown previews always use the same styling as the eventual destination. - Make sure Markdown previews always use the same styling as the eventual destination.
- Remove deprecated Group#owner_id from API
v 7.7.2 v 7.7.2
- Update GitLab Shell to version 2.4.2 that fixes a bug when developers can push to protected branch - Update GitLab Shell to version 2.4.2 that fixes a bug when developers can push to protected branch
......
...@@ -14,7 +14,6 @@ GET /groups ...@@ -14,7 +14,6 @@ GET /groups
"id": 1, "id": 1,
"name": "Foobar Group", "name": "Foobar Group",
"path": "foo-bar", "path": "foo-bar",
"owner_id": 18,
"description": "An interesting group" "description": "An interesting group"
} }
] ]
...@@ -87,7 +86,6 @@ GET /groups?search=foobar ...@@ -87,7 +86,6 @@ GET /groups?search=foobar
"id": 1, "id": 1,
"name": "Foobar Group", "name": "Foobar Group",
"path": "foo-bar", "path": "foo-bar",
"owner_id": 18,
"description": "An interesting group" "description": "An interesting group"
} }
] ]
......
...@@ -65,7 +65,7 @@ module API ...@@ -65,7 +65,7 @@ module API
end end
class Group < Grape::Entity class Group < Grape::Entity
expose :id, :name, :path, :owner_id, :description expose :id, :name, :path, :description
end end
class GroupDetail < Group class GroupDetail < Group
......
...@@ -33,9 +33,9 @@ module API ...@@ -33,9 +33,9 @@ module API
attrs = attributes_for_keys [:name, :path, :description] attrs = attributes_for_keys [:name, :path, :description]
@group = Group.new(attrs) @group = Group.new(attrs)
@group.owner = current_user
if @group.save if @group.save
@group.add_owner(current_user)
present @group, with: Entities::Group present @group, with: Entities::Group
else else
render_api_error!("Failed to save group #{@group.errors.messages}", 400) render_api_error!("Failed to save group #{@group.errors.messages}", 400)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment