Commit ec88d12b authored by Clement Ho's avatar Clement Ho

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
parents e76f26ed daf4edd2
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
%li.nav-item %li.nav-item
= link_to "Crowd", "#crowd", class: 'nav-link active', 'data-toggle' => 'tab' = link_to "Crowd", "#crowd", class: 'nav-link active', 'data-toggle' => 'tab'
- @ldap_servers.each_with_index do |server, i| - @ldap_servers.each_with_index do |server, i|
%li.nav-item{ class: active_when(i.zero? && !crowd_enabled?) } %li.nav-item
= link_to server['label'], "##{server['provider_name']}", class: 'nav-link', 'data-toggle' => 'tab' = 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? - if password_authentication_enabled_for_web?
%li.nav-item %li.nav-item
= link_to 'Standard', '#login-pane', class: 'nav-link', 'data-toggle' => 'tab' = link_to 'Standard', '#login-pane', class: 'nav-link', 'data-toggle' => 'tab'
......
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