diff options
| author | Phil Hughes <me@iamphill.com> | 2019-05-22 07:35:56 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-05-22 07:35:56 +0000 |
| commit | fc970b2c6270e3eff9da72a8f76d9b3d0cf05f00 (patch) | |
| tree | c89622c451625c88cc2302de2f91df5a5430683d | |
| parent | 1e18cf0b2b945ba9398e88eed210ed4f5f65c309 (diff) | |
| parent | 7b0e93fe2e4cd27fd24a7bf66d0d23233116ae8d (diff) | |
| download | gitlab-ce-fc970b2c6270e3eff9da72a8f76d9b3d0cf05f00.tar.gz | |
Merge branch 'signin-box-scb' into 'master'
Resolve CE/EE diffs in signin box
Closes gitlab-ee#10495
See merge request gitlab-org/gitlab-ce!28553
| -rw-r--r-- | app/views/devise/shared/_signin_box.html.haml | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/app/views/devise/shared/_signin_box.html.haml b/app/views/devise/shared/_signin_box.html.haml index ec968e435cd..f8f36a8bfff 100644 --- a/app/views/devise/shared/_signin_box.html.haml +++ b/app/views/devise/shared/_signin_box.html.haml @@ -3,17 +3,21 @@ .login-box.tab-pane{ id: "crowd", role: 'tabpanel', class: active_when(form_based_auth_provider_has_active_class?(:crowd)) } .login-body = render 'devise/sessions/new_crowd' + + = render_if_exists 'devise/sessions/new_kerberos_tab' + - @ldap_servers.each_with_index do |server, i| .login-box.tab-pane{ id: "#{server['provider_name']}", role: 'tabpanel', class: active_when(i.zero? && form_based_auth_provider_has_active_class?(:ldapmain)) } .login-body = render 'devise/sessions/new_ldap', server: server + + = render_if_exists 'devise/sessions/new_smartcard' + - if password_authentication_enabled_for_web? .login-box.tab-pane{ id: 'login-pane', role: 'tabpanel' } .login-body = render 'devise/sessions/new_base' - = render_if_exists 'devise/sessions/new_smartcard' - - elsif password_authentication_enabled_for_web? .login-box.tab-pane.active{ id: 'login-pane', role: 'tabpanel' } .login-body |