Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
fe2b98ab
Commit
fe2b98ab
authored
Feb 18, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'remove-group-id' into 'master'
Remove Group#owner_id from API For #1943 See merge request !1537
parents
000865f1
24d939af
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
3 additions
and
4 deletions
+3
-4
CHANGELOG
CHANGELOG
+1
-0
doc/api/groups.md
doc/api/groups.md
+0
-2
lib/api/entities.rb
lib/api/entities.rb
+1
-1
lib/api/groups.rb
lib/api/groups.rb
+1
-1
No files found.
CHANGELOG
View file @
fe2b98ab
...
@@ -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
...
...
doc/api/groups.md
View file @
fe2b98ab
...
@@ -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"
}
}
]
]
...
...
lib/api/entities.rb
View file @
fe2b98ab
...
@@ -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
...
...
lib/api/groups.rb
View file @
fe2b98ab
...
@@ -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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment