summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Bennett <lbennett@gitlab.com>2019-05-10 22:07:00 +0100
committerLuke Bennett <lbennett@gitlab.com>2019-05-10 22:07:00 +0100
commit537506963f8099f523224b3000dbc8cba8414a08 (patch)
treefec69c28bd3b2fe7f612e5a20fb205d2751a2ce9
parent4828ef52edee8d23ce564e9d3fe91bdb187a73e3 (diff)
downloadgitlab-ce-tabs-ldap-scb.tar.gz
Resolve CE/EE diffs in devise ldap tabstabs-ldap-scb
Part of single codebase changes.
-rw-r--r--app/views/devise/shared/_tabs_ldap.html.haml1
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'