diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-01-18 10:35:25 -0800 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-01-18 10:35:25 -0800 |
| commit | 0533ae7eec0ebe7437610965ed8ddf4386723328 (patch) | |
| tree | 038b0fb42ba533d91d0716ef4064abdb4b2d3ad3 /lib | |
| parent | 57c121aac995ecc5c227f4a5cf32aa74c24caced (diff) | |
| parent | bb80bf3612b9fe47a4a5b11645ad494fe169f586 (diff) | |
| download | gitlab-ce-0533ae7eec0ebe7437610965ed8ddf4386723328.tar.gz | |
Merge pull request #8464 from dserodio/group-api-description
Add description attribute to group API (GET and POST)
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/api/entities.rb | 2 | ||||
| -rw-r--r-- | lib/api/groups.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 2fea151aeb3..ac166ed4fba 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -65,7 +65,7 @@ module API end class Group < Grape::Entity - expose :id, :name, :path, :owner_id + expose :id, :name, :path, :owner_id, :description end class GroupDetail < Group diff --git a/lib/api/groups.rb b/lib/api/groups.rb index bda60b3b7d5..730dfad52c8 100644 --- a/lib/api/groups.rb +++ b/lib/api/groups.rb @@ -47,7 +47,7 @@ module API authenticated_as_admin! required_attributes! [:name, :path] - attrs = attributes_for_keys [:name, :path] + attrs = attributes_for_keys [:name, :path, :description] @group = Group.new(attrs) @group.owner = current_user |