diff options
| author | Luke Bennett <lbennett@gitlab.com> | 2019-05-21 19:00:30 +0100 |
|---|---|---|
| committer | Luke Bennett <lbennett@gitlab.com> | 2019-05-21 19:00:30 +0100 |
| commit | 7b0e93fe2e4cd27fd24a7bf66d0d23233116ae8d (patch) | |
| tree | fdb4d44f0826d5bc136f860a0ecb241f00457caa | |
| parent | e63b65cd4f5d8298cb0441a5e0e5a0321f739367 (diff) | |
| download | gitlab-ce-7b0e93fe2e4cd27fd24a7bf66d0d23233116ae8d.tar.gz | |
Resolve CE/EE diffs in signin boxsignin-box-scb
Part of single codebase changes.
| -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 |