diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2016-11-10 18:29:22 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2016-11-10 18:29:22 +0000 |
| commit | 3e089d7fa47c628b0e14c9ba0b07ac258ff8155b (patch) | |
| tree | 791d0dfc35e664ece2351e322b4b873883b583de | |
| parent | bb9586706419652dd52918e492d35710df4f7e69 (diff) | |
| parent | 45c9d1e7bbc8d86a1a4f22dfd910dd7aacf42a1a (diff) | |
| download | gitlab-ce-3e089d7fa47c628b0e14c9ba0b07ac258ff8155b.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 |