diff options
| author | Bryce Johnson <bryce@gitlab.com> | 2016-09-28 14:26:37 +0300 |
|---|---|---|
| committer | Bryce Johnson <bryce@gitlab.com> | 2016-10-15 09:28:52 +0300 |
| commit | 673c23dd7ebef7d6c370a0d0d5c024c1c042261c (patch) | |
| tree | e6879c7211b237dcc00571db3e292d9ca269ad89 | |
| parent | 69f9c00cfb7d80959a523a10ef7d5f53a37b21e5 (diff) | |
Unbreak all the tests relying on one login-box.
| -rw-r--r-- | app/views/devise/sessions/new.html.haml | 2 | ||||
| -rw-r--r-- | app/views/devise/shared/_omniauth_box.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/devise/sessions/new.html.haml b/app/views/devise/sessions/new.html.haml index dbdbc9689aa..2fb05b9456b 100644 --- a/app/views/devise/sessions/new.html.haml +++ b/app/views/devise/sessions/new.html.haml @@ -13,7 +13,7 @@ = render 'devise/shared/signup_box' - if omniauth_enabled? && devise_mapping.omniauthable? && button_based_providers_enabled? - .clearfix.omniauth-box + .clearfix = render 'devise/shared/omniauth_box' -# Show a message if none of the mechanisms above are enabled diff --git a/app/views/devise/shared/_omniauth_box.html.haml b/app/views/devise/shared/_omniauth_box.html.haml index d5b6db48a29..8908b64cdac 100644 --- a/app/views/devise/shared/_omniauth_box.html.haml +++ b/app/views/devise/shared/_omniauth_box.html.haml @@ -1,4 +1,4 @@ -%div.login-box +%div.omniauth-container %p %span.light Sign in with |