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 /app/models/group.rb | |
| parent | 728a207ea6a99a4bddc16dbbe82294d3fdb60fe4 (diff) | |
| download | gitlab-ce-9411a664118a3247d0a56baf7e7ef4549c1201c3.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/group.rb')
| -rw-r--r-- | app/models/group.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/group.rb b/app/models/group.rb index 186253619fe..51b4fe4c1ce 100644 --- a/app/models/group.rb +++ b/app/models/group.rb @@ -496,7 +496,7 @@ class Group < Namespace end def max_member_access_for_user_from_shared_groups(user) - return unless Feature.enabled?(:share_group_with_group) + return unless Feature.enabled?(:share_group_with_group, default_enabled: true) group_group_link_table = GroupGroupLink.arel_table group_member_table = GroupMember.arel_table |