Merge branch 'sh-fix-login-active-tabs-ee' into 'master'

Fix multiple active tabs when Crowd or LDAP is in use

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

app/views/devise/shared/_tabs_ldap.html.haml

@@ -3,11 +3,11 @@
     %li.nav-item
       = link_to "Crowd", "#crowd", class: 'nav-link active', 'data-toggle' => 'tab'
   - if kerberos_enabled?
-    %li.nav-item{ class: (:active unless crowd_enabled? || ldap_enabled?) }
-      = link_to "Kerberos", "#kerberos", class: 'nav-link', 'data-toggle' => 'tab'
+    %li.nav-item
+      = link_to "Kerberos", "#kerberos", class: "nav-link #{active_when(!crowd_enabled? && !ldap_enabled?)}", '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'