Commit af9f1ec2 authored by Douwe Maan's avatar Douwe Maan

Fix sign in form when just Kerberos is enabled

parent 01b4bea0
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
= render 'devise/shared/signin_box' = render 'devise/shared/signin_box'
-# Omniauth fits between signin/ldap signin and signup and does not have a surrounding box -# Omniauth fits between signin/ldap signin and signup and does not have a surrounding box
- if Gitlab.config.omniauth.enabled && devise_mapping.omniauthable? - if Gitlab.config.omniauth.enabled && devise_mapping.omniauthable? && button_based_providers.any?
.clearfix.prepend-top-20 .clearfix.prepend-top-20
= render 'devise/shared/omniauth_box' = render 'devise/shared/omniauth_box'
......
...@@ -8,9 +8,10 @@ ...@@ -8,9 +8,10 @@
.login-body .login-body
- if form_based_providers.any? - if form_based_providers.any?
%ul.nav.nav-tabs %ul.nav.nav-tabs
- @ldap_servers.each_with_index do |server, i| - if ldap_enabled?
%li{class: (:active if i.zero?)} - @ldap_servers.each_with_index do |server, i|
= link_to server['label'], "#tab-#{server['provider_name']}", 'data-toggle' => 'tab' %li{class: (:active if i.zero?)}
= link_to server['label'], "#tab-#{server['provider_name']}", 'data-toggle' => 'tab'
- if kerberos_enabled? - if kerberos_enabled?
%li{class: (:active unless ldap_enabled?)} %li{class: (:active unless ldap_enabled?)}
= link_to "Kerberos", "#tab-kerberos", 'data-toggle' => 'tab' = link_to "Kerberos", "#tab-kerberos", 'data-toggle' => 'tab'
...@@ -18,9 +19,10 @@ ...@@ -18,9 +19,10 @@
%li %li
= link_to 'Standard', '#tab-signin', 'data-toggle' => 'tab' = link_to 'Standard', '#tab-signin', 'data-toggle' => 'tab'
.tab-content .tab-content
- @ldap_servers.each_with_index do |server, i| - if ldap_enabled?
%div.tab-pane{id: "tab-#{server['provider_name']}", class: (:active if i.zero?)} - @ldap_servers.each_with_index do |server, i|
= render 'devise/sessions/new_ldap', server: server %div.tab-pane{id: "tab-#{server['provider_name']}", class: (:active if i.zero?)}
= render 'devise/sessions/new_ldap', server: server
- if kerberos_enabled? - if kerberos_enabled?
%div#tab-kerberos.tab-pane{class: (:active unless ldap_enabled?)} %div#tab-kerberos.tab-pane{class: (:active unless ldap_enabled?)}
= render 'devise/sessions/new_kerberos', provider: :kerberos = render 'devise/sessions/new_kerberos', provider: :kerberos
......
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