diff options
| author | Marin Jankovski <marin@gitlab.com> | 2014-10-22 12:42:41 +0000 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2014-10-22 12:42:41 +0000 |
| commit | 5e2a1c14eb03431c2019753603746a4e778f2e73 (patch) | |
| tree | e9d767aa72a985561b68431ac0470a20f14dcb3e | |
| parent | 05f19392b76d9fbe40d97547ee2a3c87883c9639 (diff) | |
| parent | b0ef23c1936577b0d3a9d5e58c808bb24b41b0ea (diff) | |
| download | gitlab-ce-5e2a1c14eb03431c2019753603746a4e778f2e73.tar.gz | |
Merge branch 'fix-500-login-disabled' into 'master'
Fix 500 error on login page if ldap enabled and sign-in disabled
Related to gitlab/gitlabhq#1701
See merge request !1209
| -rw-r--r-- | app/views/devise/sessions/new.html.haml | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/app/views/devise/sessions/new.html.haml b/app/views/devise/sessions/new.html.haml index b9832787446..ca7e9570b43 100644 --- a/app/views/devise/sessions/new.html.haml +++ b/app/views/devise/sessions/new.html.haml @@ -2,22 +2,22 @@ .login-heading %h3 Sign in .login-body - - if ldap_enabled? && gitlab_config.signin_enabled + - if ldap_enabled? %ul.nav.nav-tabs - @ldap_servers.each_with_index do |server, i| - %li{class: (:active if i==0)} + %li{class: (:active if i.zero?)} = link_to server['label'], "#tab-#{server['provider_name']}", 'data-toggle' => 'tab' - %li - = link_to 'Standard', '#tab-signin', 'data-toggle' => 'tab' + - if gitlab_config.signin_enabled + %li + = link_to 'Standard', '#tab-signin', 'data-toggle' => 'tab' .tab-content - - @ldap_servers.each_with_index do |server,i| - %div.tab-pane{id: "tab-#{server['provider_name']}", class: (:active if i==0)} + - @ldap_servers.each_with_index do |server, i| + %div.tab-pane{id: "tab-#{server['provider_name']}", class: (:active if i.zero?)} = render 'devise/sessions/new_ldap', provider: server['provider_name'] - %div#tab-signin.tab-pane - = render 'devise/sessions/new_base' + - if gitlab_config.signin_enabled + %div#tab-signin.tab-pane + = render 'devise/sessions/new_base' - - elsif ldap_enabled? - = render 'devise/sessions/new_ldap', ldap_servers: @ldap_servers - elsif gitlab_config.signin_enabled = render 'devise/sessions/new_base' - else |