diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-06-21 15:53:33 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-06-25 12:54:52 +0100 |
| commit | e56ef0acc35a25f5984764db473099c087bd95b9 (patch) | |
| tree | c697a38b666d126f71f13ff999e71c12557be84b | |
| parent | 9920855a8d3fe63fb0abe50f4e65434a5e8e3b42 (diff) | |
| download | gitlab-ce-e56ef0acc35a25f5984764db473099c087bd95b9.tar.gz | |
Merge branch 'sh-fix-login-active-tabs' into 'master'
Fix multiple active tabs when Crowd or LDAP is in use
Closes #48192
See merge request gitlab-org/gitlab-ce!20049
| -rw-r--r-- | app/views/devise/shared/_tabs_ldap.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/devise/shared/_tabs_ldap.html.haml b/app/views/devise/shared/_tabs_ldap.html.haml index 087af61235b..58c585a29ff 100644 --- a/app/views/devise/shared/_tabs_ldap.html.haml +++ b/app/views/devise/shared/_tabs_ldap.html.haml @@ -3,8 +3,8 @@ %li.nav-item = link_to "Crowd", "#crowd", class: 'nav-link active', 'data-toggle' => 'tab' - @ldap_servers.each_with_index do |server, i| - %li.nav-item{ class: active_when(i.zero? && !crowd_enabled?) } - = link_to server['label'], "##{server['provider_name']}", class: 'nav-link', 'data-toggle' => 'tab' + %li.nav-item + = link_to server['label'], "##{server['provider_name']}", class: "nav-link #{active_when(i.zero? && !crowd_enabled?)}", 'data-toggle' => 'tab' - if password_authentication_enabled_for_web? %li.nav-item = link_to 'Standard', '#login-pane', class: 'nav-link', 'data-toggle' => 'tab' |