Merge branch '24038-fix-no-register-pane-if-ldap' into 'master'

Fix no "Register" tab if ldap auth is enabled (#24038) Closes #24038 See merge request !7274

Merge branch '24038-fix-no-register-pane-if-ldap' into 'master'
3e089d7f · Sean McGivern · bb958670 · 45c9d1e7 · 3e089d7f · 3e089d7f
Commit 3e089d7f authored Nov 10, 2016 by Sean McGivern
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 0 deletions

_tabs_ldap.html.haml app/views/devise/shared/_tabs_ldap.html.haml +3 -0

24038-fix-no-register-pane-if-ldap.yml changelogs/unreleased/24038-fix-no-register-pane-if-ldap.yml +4 -0

No files found.
--- 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'
--- a/changelogs/unreleased/24038-fix-no-register-pane-if-ldap.yml
+++ b/changelogs/unreleased/24038-fix-no-register-pane-if-ldap.yml
+---
+title: Fix no "Register" tab if ldap auth is enabled (#24038)
+merge_request: 7274
+author: Luc Didry