diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-06-06 19:58:44 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-06-06 19:58:44 +0000 |
| commit | 70499df224320e9809c0ea67235551da871c8442 (patch) | |
| tree | 3364e645052e5ce10cf3559e61c9af036beb38d7 | |
| parent | 2838bb4d7b2e9634baffe764351abbab2bb929a7 (diff) | |
| parent | cd47c0b807948129909f03ff78800a3906b7d436 (diff) | |
| download | gitlab-ce-70499df224320e9809c0ea67235551da871c8442.tar.gz | |
Merge branch '47362-members-tabs' into 'master'
Resolve "Project > Settings > Members - The active tab doesn't work correctly"
Closes #47362
See merge request gitlab-org/gitlab-ce!19463
| -rw-r--r-- | app/views/projects/project_members/index.html.haml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/views/projects/project_members/index.html.haml b/app/views/projects/project_members/index.html.haml index 43848d674c2..9716322f8a1 100644 --- a/app/views/projects/project_members/index.html.haml +++ b/app/views/projects/project_members/index.html.haml @@ -18,11 +18,11 @@ .light - if can?(current_user, :admin_project_member, @project) %ul.nav-links.nav.nav-tabs.gitlab-tabs{ role: 'tablist' } - %li.active{ role: 'presentation' } - %a{ href: '#add-member-pane', id: 'add-member-tab', data: { toggle: 'tab' }, role: 'tab' } Add member + %li.nav-tab{ role: 'presentation' } + %a.nav-link.active{ 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' } - %a{ href: '#share-with-group-pane', id: 'share-with-group-tab', data: { toggle: 'tab' }, role: 'tab' } Share with group + %li.nav-tab{ role: 'presentation' } + %a.nav-link{ href: '#share-with-group-pane', id: 'share-with-group-tab', data: { toggle: 'tab' }, role: 'tab' } Share with group .tab-content.gitlab-tab-content .tab-pane.active{ id: 'add-member-pane', role: 'tabpanel' } |