diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2016-11-10 18:29:22 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-11-15 18:37:52 +0100 |
| commit | bcee8e00f7f2ca59158ab34b7217044dca764ff0 (patch) | |
| tree | 8a07dfecb7b15a86603b51911a318d3bac64f42f | |
| parent | 548bbf83992b9eca568819ab2bda4bc3000d0138 (diff) | |
| download | gitlab-ce-bcee8e00f7f2ca59158ab34b7217044dca764ff0.tar.gz | |
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
| -rw-r--r-- | app/views/devise/shared/_tabs_ldap.html.haml | 3 | ||||
| -rw-r--r-- | changelogs/unreleased/24038-fix-no-register-pane-if-ldap.yml | 4 |
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 |