diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-07 15:05:59 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-07 15:05:59 +0000 |
| commit | 31040b5bfe48f8d73830f473513164427522b3a6 (patch) | |
| tree | 6301b395ad45d7a0f84aa0f9c31373889208d09b /app/views/devise/sessions/new.html.haml | |
| parent | 185f428fa5e6123ffa0f29e307523da138e7b028 (diff) | |
| download | gitlab-ce-31040b5bfe48f8d73830f473513164427522b3a6.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/devise/sessions/new.html.haml')
| -rw-r--r-- | app/views/devise/sessions/new.html.haml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/views/devise/sessions/new.html.haml b/app/views/devise/sessions/new.html.haml index 30ed7ed6b29..17e5da501f5 100644 --- a/app/views/devise/sessions/new.html.haml +++ b/app/views/devise/sessions/new.html.haml @@ -4,7 +4,8 @@ - if form_based_providers.any? = render 'devise/shared/tabs_ldap' - else - = render 'devise/shared/tabs_normal' + - unless use_experimental_separate_sign_up_flow? + = render 'devise/shared/tabs_normal' .tab-content - if password_authentication_enabled_for_web? || ldap_enabled? || crowd_enabled? = render 'devise/shared/signin_box' |