diff options
author | Phil Hughes <me@iamphill.com> | 2019-05-15 10:34:08 +0300 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2019-05-15 10:34:08 +0300 |
commit | 3c0ab4825346fc1a9cdf3f590bd8e481f5e963f0 (patch) | |
tree | 5879bdf2025f1125d0924a87324af167b9720bbd /app/views | |
parent | 6bf5af2acd5e046d4235dee6473c214e91d86379 (diff) | |
parent | 537506963f8099f523224b3000dbc8cba8414a08 (diff) |
Merge branch 'tabs-ldap-scb' into 'master'
Resolve CE/EE diffs in devise ldap tabs
See merge request gitlab-org/gitlab-ce!28252
Diffstat (limited to 'app/views')
-rw-r--r-- | app/views/devise/shared/_tabs_ldap.html.haml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/views/devise/shared/_tabs_ldap.html.haml b/app/views/devise/shared/_tabs_ldap.html.haml index aee05b6c81c..b1a9470cf1c 100644 --- a/app/views/devise/shared/_tabs_ldap.html.haml +++ b/app/views/devise/shared/_tabs_ldap.html.haml @@ -2,6 +2,7 @@ - if crowd_enabled? %li.nav-item = link_to "Crowd", "#crowd", class: "nav-link #{active_when(form_based_auth_provider_has_active_class?(:crowd))}", 'data-toggle' => 'tab' + = render_if_exists "devise/shared/kerberos_tab" - @ldap_servers.each_with_index do |server, i| %li.nav-item = link_to server['label'], "##{server['provider_name']}", class: "nav-link #{active_when(i.zero? && form_based_auth_provider_has_active_class?(:ldapmain))} qa-ldap-tab", 'data-toggle' => 'tab' |