diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-17 12:08:34 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-17 12:08:34 +0000 |
commit | 9411a664118a3247d0a56baf7e7ef4549c1201c3 (patch) | |
tree | fdc4add90292bc4f8e9c612d90a8ea5ad898fe21 /lib | |
parent | 728a207ea6a99a4bddc16dbbe82294d3fdb60fe4 (diff) | |
download | gitlab-ce-9411a664118a3247d0a56baf7e7ef4549c1201c3.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab/project_authorizations.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/project_authorizations.rb b/lib/gitlab/project_authorizations.rb index 4e5e2d4a6a9..e2271b1492c 100644 --- a/lib/gitlab/project_authorizations.rb +++ b/lib/gitlab/project_authorizations.rb @@ -68,7 +68,7 @@ module Gitlab .select([namespaces[:id], members[:access_level]]) .except(:order) - if Feature.enabled?(:share_group_with_group) + if Feature.enabled?(:share_group_with_group, default_enabled: true) # Namespaces shared with any of the group cte << Group.select([namespaces[:id], 'group_group_links.group_access AS access_level']) .joins(join_group_group_links) |