Merge branch '37494-group-tab-member-lock' into 'master'

Show group tab if member lock is enabled

Closes #3575

See merge request gitlab-org/gitlab-ee!3025

app/views/projects/project_members/index.html.haml

@@ -16,18 +16,20 @@
         or
         %i Owners
     .light
-      - if can?(current_user, :admin_project_member, @project) && !membership_locked?
+      - if can?(current_user, :admin_project_member, @project)
         %ul.nav-links.project-member-tabs{ role: 'tablist' }
-          %li.active{ role: 'presentation' }
-            %a{ href: '#add-member-pane', id: 'add-member-tab', data: { toggle: 'tab' }, role: 'tab' } Add member
+          - if !membership_locked?
+            %li.active{ role: 'presentation' }
+              %a{ href: '#add-member-pane', id: 'add-member-tab', data: { toggle: 'tab' }, role: 'tab' } Add member
           - if @project.allowed_to_share_with_group?
-            %li{ role: 'presentation' }
+            %li{ role: 'presentation', class: ('active' if membership_locked?) }
               %a{ href: '#share-with-group-pane', id: 'share-with-group-tab', data: { toggle: 'tab' }, role: 'tab' } Share with group
 
         .tab-content.project-member-tab-content
-          .tab-pane.active{ id: 'add-member-pane', role: 'tabpanel' }
-            = render 'projects/project_members/new_project_member', tab_title: 'Add member'
-          .tab-pane{ id: 'share-with-group-pane', role: 'tabpanel' }
+          - if !membership_locked?
+            .tab-pane.active{ id: 'add-member-pane', role: 'tabpanel' }
+              = render 'projects/project_members/new_project_member', tab_title: 'Add member'
+          .tab-pane{ id: 'share-with-group-pane', role: 'tabpanel', class: ('active' if membership_locked?) }
             = render 'projects/project_members/new_shared_group', tab_title: 'Share with group'
 
         = render 'shared/members/requests', membership_source: @project, requesters: @requesters

changelogs/unreleased-ee/37494-group-tab-member-lock.yml

+---
+title: Show group tab if member lock is enabled
+merge_request:
+author:
+type: fixed