diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-03-14 16:38:52 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-03-14 16:38:52 +0000 |
| commit | d324bf84340b58452181eeadb68c64d1888b3f9e (patch) | |
| tree | a10cfbb93aabd424d7d89edde73de41f44857f6e /lib/api/entities.rb | |
| parent | d213758a9a8cee4f654fce9702e3954786961fae (diff) | |
| parent | e8b3b92ddebc47595fe4b69dc5b5a3a6dd1365ab (diff) | |
| download | gitlab-ce-d324bf84340b58452181eeadb68c64d1888b3f9e.tar.gz | |
Merge branch 'share-project-ce' into 'master'
Bring from EE: Share Project with Group
- [x] Models and migrations
- [x] Logic, UI
- [x] Tests
- [x] Documentation
- [x] Share with group lock
- [x] Api feature
- [x] Api docs
- [x] Api tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
For #12831
cc @DouweM @rspeicher @vsizov
See merge request !3186
Diffstat (limited to 'lib/api/entities.rb')
| -rw-r--r-- | lib/api/entities.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index b49af093a14..7204dca34ba 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -246,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 |