Commit d13d8347 authored by Imre Farkas's avatar Imre Farkas

Set share_group_with_group feature flag default on

parent 9cd82c24
...@@ -53,6 +53,6 @@ class Groups::GroupLinksController < Groups::ApplicationController ...@@ -53,6 +53,6 @@ class Groups::GroupLinksController < Groups::ApplicationController
end end
def check_feature_flag! def check_feature_flag!
render_404 unless Feature.enabled?(:share_group_with_group) render_404 unless Feature.enabled?(:share_group_with_group, default_enabled: true)
end end
end end
...@@ -496,7 +496,7 @@ class Group < Namespace ...@@ -496,7 +496,7 @@ class Group < Namespace
end end
def max_member_access_for_user_from_shared_groups(user) 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_group_link_table = GroupGroupLink.arel_table
group_member_table = GroupMember.arel_table group_member_table = GroupMember.arel_table
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
= _("Group members") = _("Group members")
%hr %hr
- if can_manage_members - if can_manage_members
- if Feature.enabled?(:share_group_with_group) - if Feature.enabled?(:share_group_with_group, default_enabled: true)
%ul.nav-links.nav.nav-tabs.gitlab-tabs{ role: 'tablist' } %ul.nav-links.nav.nav-tabs.gitlab-tabs{ role: 'tablist' }
%li.nav-tab{ role: 'presentation' } %li.nav-tab{ role: 'presentation' }
%a.nav-link.active{ href: '#invite-member-pane', id: 'invite-member-tab', data: { toggle: 'tab' }, role: 'tab' }= _("Invite member") %a.nav-link.active{ href: '#invite-member-pane', id: 'invite-member-tab', data: { toggle: 'tab' }, role: 'tab' }= _("Invite member")
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
.tab-content.gitlab-tab-content .tab-content.gitlab-tab-content
.tab-pane.active{ id: 'invite-member-pane', role: 'tabpanel' } .tab-pane.active{ id: 'invite-member-pane', role: 'tabpanel' }
= render_invite_member_for_group(@group, @group_member.access_level) = render_invite_member_for_group(@group, @group_member.access_level)
- if Feature.enabled?(:share_group_with_group) - if Feature.enabled?(:share_group_with_group, default_enabled: true)
.tab-pane{ id: 'invite-group-pane', role: 'tabpanel' } .tab-pane{ id: 'invite-group-pane', role: 'tabpanel' }
= render 'shared/members/invite_group', submit_url: group_group_links_path(@group), access_levels: GroupMember.access_level_roles, default_access_level: @group_member.access_level, group_link_field: 'shared_with_group_id', group_access_field: 'shared_group_access' = render 'shared/members/invite_group', submit_url: group_group_links_path(@group), access_levels: GroupMember.access_level_roles, default_access_level: @group_member.access_level, group_link_field: 'shared_with_group_id', group_access_field: 'shared_group_access'
- else - else
......
---
title: Allow to share groups with other groups
merge_request: 23185
author:
type: changed
...@@ -68,7 +68,7 @@ module Gitlab ...@@ -68,7 +68,7 @@ module Gitlab
.select([namespaces[:id], members[:access_level]]) .select([namespaces[:id], members[:access_level]])
.except(:order) .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 # Namespaces shared with any of the group
cte << Group.select([namespaces[:id], 'group_group_links.group_access AS access_level']) cte << Group.select([namespaces[:id], 'group_group_links.group_access AS access_level'])
.joins(join_group_group_links) .joins(join_group_group_links)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment