mirror of
https://github.com/wahyd4/gitlabhq.git
synced 2026-08-26 04:56:16 +10:00
Do not use primary flag for LDAP servers
This commit is contained in:
@@ -4,14 +4,14 @@
|
||||
.login-body
|
||||
- if ldap_enabled? && gitlab_config.signin_enabled
|
||||
%ul.nav.nav-tabs
|
||||
- @ldap_servers.each do |server|
|
||||
%li{class: (:active if server['primary'])}
|
||||
- @ldap_servers.each_with_index do |server, i|
|
||||
%li{class: (:active if i==0)}
|
||||
= link_to server['label'], "#tab-#{server.provider_name}", 'data-toggle' => 'tab'
|
||||
%li
|
||||
= link_to 'Standard', '#tab-signin', 'data-toggle' => 'tab'
|
||||
.tab-content
|
||||
- @ldap_servers.each do |server|
|
||||
%div.tab-pane{id: "tab-#{server.provider_name}", class: (:active if server['primary'])}
|
||||
- @ldap_servers.each_with_index do |server,i|
|
||||
%div.tab-pane{id: "tab-#{server.provider_name}", class: (:active if i==0)}
|
||||
= render 'devise/sessions/new_ldap', provider: server.provider_name
|
||||
%div#tab-signin.tab-pane
|
||||
= render 'devise/sessions/new_base'
|
||||
|
||||
@@ -64,7 +64,6 @@ if Settings.ldap['enabled'] || Rails.env.test?
|
||||
if Settings.ldap['host'].present?
|
||||
excluded_per_server_settings = %w(sync_time allow_username_or_email_login)
|
||||
server = Settings.ldap.except(excluded_per_server_settings)
|
||||
server['primary'] = true
|
||||
server['label'] = 'LDAP'
|
||||
server['provider_id'] = '' #providername will be ldap
|
||||
Settings.ldap['servers'] = [server]
|
||||
|
||||
Reference in New Issue
Block a user