diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-17 15:08:34 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-17 15:08:34 +0300 |
| commit | 9411a664118a3247d0a56baf7e7ef4549c1201c3 (patch) | |
| tree | fdc4add90292bc4f8e9c612d90a8ea5ad898fe21 /app/views/groups | |
| parent | 728a207ea6a99a4bddc16dbbe82294d3fdb60fe4 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/groups')
| -rw-r--r-- | app/views/groups/group_members/index.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/groups/group_members/index.html.haml b/app/views/groups/group_members/index.html.haml index 6eb8a8947cc..048edb80d99 100644 --- a/app/views/groups/group_members/index.html.haml +++ b/app/views/groups/group_members/index.html.haml @@ -9,7 +9,7 @@ = _("Group members") %hr - 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' } %li.nav-tab{ role: 'presentation' } %a.nav-link.active{ href: '#invite-member-pane', id: 'invite-member-tab', data: { toggle: 'tab' }, role: 'tab' }= _("Invite member") @@ -18,7 +18,7 @@ .tab-content.gitlab-tab-content .tab-pane.active{ id: 'invite-member-pane', role: 'tabpanel' } = 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' } = 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 |