diff options
| author | Ahmad Sherif <me@ahmadsherif.com> | 2016-11-21 15:33:58 +0200 |
|---|---|---|
| committer | Ahmad Sherif <me@ahmadsherif.com> | 2016-11-23 12:59:07 +0200 |
| commit | 0f3c3a1c57beb8269f97e408f19e76ba77aac99c (patch) | |
| tree | fbdb57ba753d7afd1b7a6f7463f5146681e5ec70 /app/models/group.rb | |
| parent | 916332815e33c655f727a28457f655f6425306ae (diff) | |
| download | gitlab-ce-0f3c3a1c57beb8269f97e408f19e76ba77aac99c.tar.gz | |
Update user's authorized projects if project is allowed to share with group
Diffstat (limited to 'app/models/group.rb')
| -rw-r--r-- | app/models/group.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/models/group.rb b/app/models/group.rb index 40ba8b6a34d..4248e1162d8 100644 --- a/app/models/group.rb +++ b/app/models/group.rb @@ -65,7 +65,9 @@ class Group < Namespace def select_for_project_authorization if current_scope.joins_values.include?(:shared_projects) - select("members.user_id, projects.id AS project_id, LEAST(project_group_links.group_access, members.access_level) AS access_level") + joins('INNER JOIN namespaces project_namespace ON project_namespace.id = projects.namespace_id') + .where('project_namespace.share_with_group_lock = ?', false) + .select("members.user_id, projects.id AS project_id, LEAST(project_group_links.group_access, members.access_level) AS access_level") else super end |