summaryrefslogtreecommitdiff
path: root/app/views/devise
diff options
context:
space:
mode:
authorBryce Johnson <bryce@gitlab.com>2016-09-28 17:13:42 +0200
committerBryce Johnson <bryce@gitlab.com>2016-10-15 08:28:53 +0200
commit445711675ca198660dcaee014cd4229b8eb266ab (patch)
treec210693db2cf29611cf7151b0e43446370726772 /app/views/devise
parent1fd09260826413da928363c3199d4dfbb770d2c3 (diff)
downloadgitlab-ce-445711675ca198660dcaee014cd4229b8eb266ab.tar.gz
Fix nesting on sessions/new.
Diffstat (limited to 'app/views/devise')
-rw-r--r--app/views/devise/sessions/new.html.haml15
1 files changed, 7 insertions, 8 deletions
diff --git a/app/views/devise/sessions/new.html.haml b/app/views/devise/sessions/new.html.haml
index 2fb05b9456b..fa8e7979461 100644
--- a/app/views/devise/sessions/new.html.haml
+++ b/app/views/devise/sessions/new.html.haml
@@ -12,12 +12,11 @@
- if signin_enabled? && signup_enabled?
= render 'devise/shared/signup_box'
- - if omniauth_enabled? && devise_mapping.omniauthable? && button_based_providers_enabled?
- .clearfix
- = render 'devise/shared/omniauth_box'
-
- -# Show a message if none of the mechanisms above are enabled
- - if !signin_enabled? && !ldap_enabled? && !(omniauth_enabled? && devise_mapping.omniauthable?)
- %div
- No authentication methods configured.
+ -# Show a message if none of the mechanisms above are enabled
+ - if !signin_enabled? && !ldap_enabled? && !(omniauth_enabled? && devise_mapping.omniauthable?)
+ %div
+ No authentication methods configured.
+ - if omniauth_enabled? && devise_mapping.omniauthable? && button_based_providers_enabled?
+ .clearfix
+ = render 'devise/shared/omniauth_box'