summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/views/devise/shared/_tabs_ldap.html.haml3
-rw-r--r--changelogs/unreleased/24038-fix-no-register-pane-if-ldap.yml4
2 files changed, 7 insertions, 0 deletions
diff --git a/app/views/devise/shared/_tabs_ldap.html.haml b/app/views/devise/shared/_tabs_ldap.html.haml
index 1e957f0935f..aec1b31ce62 100644
--- a/app/views/devise/shared/_tabs_ldap.html.haml
+++ b/app/views/devise/shared/_tabs_ldap.html.haml
@@ -8,3 +8,6 @@
- if signin_enabled?
%li
= link_to 'Standard', '#ldap-standard', 'data-toggle' => 'tab'
+ - if signin_enabled? && signup_enabled?
+ %li
+ = link_to 'Register', '#register-pane', 'data-toggle' => 'tab'
diff --git a/changelogs/unreleased/24038-fix-no-register-pane-if-ldap.yml b/changelogs/unreleased/24038-fix-no-register-pane-if-ldap.yml
new file mode 100644
index 00000000000..53f418b6b18
--- /dev/null
+++ b/changelogs/unreleased/24038-fix-no-register-pane-if-ldap.yml
@@ -0,0 +1,4 @@
+---
+title: Fix no "Register" tab if ldap auth is enabled (#24038)
+merge_request: 7274
+author: Luc Didry