diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2017-01-25 16:17:43 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2017-01-25 16:17:43 +0300 |
| commit | 8a9597fc737b9c848b8e1935551edb2f1d09aab0 (patch) | |
| tree | 90148cee8da324667d09226486d50e3ca9042327 /app/services/users | |
| parent | bc7febfff094531d385bb6dc3f53885fb0a2f400 (diff) | |
| parent | 52c5f9c97f20529b608f5b47a7c361383ccadb54 (diff) | |
Merge branch 'dz-nested-groups-access-improvements' into 'master'
Nested groups feature improvemetns
See merge request !8448
Diffstat (limited to 'app/services/users')
| -rw-r--r-- | app/services/users/refresh_authorized_projects_service.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/services/users/refresh_authorized_projects_service.rb b/app/services/users/refresh_authorized_projects_service.rb index 2d211d5ebbe..fad741531ea 100644 --- a/app/services/users/refresh_authorized_projects_service.rb +++ b/app/services/users/refresh_authorized_projects_service.rb @@ -118,7 +118,8 @@ module Users user.personal_projects.select("#{user.id} AS user_id, projects.id AS project_id, #{Gitlab::Access::MASTER} AS access_level"), user.groups_projects.select_for_project_authorization, user.projects.select_for_project_authorization, - user.groups.joins(:shared_projects).select_for_project_authorization + user.groups.joins(:shared_projects).select_for_project_authorization, + user.nested_projects.select_for_project_authorization ] Gitlab::SQL::Union.new(relations) |