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 /app/finders/projects_finder.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 'app/finders/projects_finder.rb')
| -rw-r--r-- | app/finders/projects_finder.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/finders/projects_finder.rb b/app/finders/projects_finder.rb index 0e5a8f5ee0f..2c55f088594 100644 --- a/app/finders/projects_finder.rb +++ b/app/finders/projects_finder.rb @@ -43,7 +43,8 @@ class ProjectsFinder if current_user [ group_projects_for_user(current_user, group), - group.projects.public_and_internal_only + group.projects.public_and_internal_only, + group.shared_projects.visible_to_user(current_user) ] else [group.projects.public_only] |