Do not use primary flag for LDAP servers

parent 5b381868
...@@ -4,14 +4,14 @@ ...@@ -4,14 +4,14 @@
.login-body .login-body
- if ldap_enabled? && gitlab_config.signin_enabled - if ldap_enabled? && gitlab_config.signin_enabled
%ul.nav.nav-tabs %ul.nav.nav-tabs
- @ldap_servers.each do |server| - @ldap_servers.each_with_index do |server, i|
%li{class: (:active if server['primary'])} %li{class: (:active if i==0)}
= link_to server['label'], "#tab-#{server.provider_name}", 'data-toggle' => 'tab' = link_to server['label'], "#tab-#{server.provider_name}", 'data-toggle' => 'tab'
%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 do |server| - @ldap_servers.each_with_index do |server,i|
%div.tab-pane{id: "tab-#{server.provider_name}", class: (:active if server['primary'])} %div.tab-pane{id: "tab-#{server.provider_name}", class: (:active if i==0)}
= render 'devise/sessions/new_ldap', provider: server.provider_name = render 'devise/sessions/new_ldap', provider: server.provider_name
%div#tab-signin.tab-pane %div#tab-signin.tab-pane
= render 'devise/sessions/new_base' = render 'devise/sessions/new_base'
......
...@@ -64,7 +64,6 @@ if Settings.ldap['enabled'] || Rails.env.test? ...@@ -64,7 +64,6 @@ if Settings.ldap['enabled'] || Rails.env.test?
if Settings.ldap['host'].present? if Settings.ldap['host'].present?
excluded_per_server_settings = %w(sync_time allow_username_or_email_login) excluded_per_server_settings = %w(sync_time allow_username_or_email_login)
server = Settings.ldap.except(excluded_per_server_settings) server = Settings.ldap.except(excluded_per_server_settings)
server['primary'] = true
server['label'] = 'LDAP' server['label'] = 'LDAP'
server['provider_id'] = '' #providername will be ldap server['provider_id'] = '' #providername will be ldap
Settings.ldap['servers'] = [server] Settings.ldap['servers'] = [server]
......
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