summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorAndrei Gliga <otzy_007@yahoo.com>2016-05-04 13:36:57 +0300
committerAndrei Gliga <otzy_007@yahoo.com>2016-05-12 13:44:46 +0300
commit284eccb5e68c863ea8e1001a24af33dd0da5e201 (patch)
tree053b333cb68eb5308704c585edd055548c861962 /app
parentd943e5f691ad9c59e349eab95f1a21bd0f85ab1b (diff)
downloadgitlab-ce-284eccb5e68c863ea8e1001a24af33dd0da5e201.tar.gz
render the omniauth_box if there are any button_based_providers
Diffstat (limited to 'app')
-rw-r--r--app/views/devise/sessions/new.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/devise/sessions/new.html.haml b/app/views/devise/sessions/new.html.haml
index d65fa60025c..28194506acc 100644
--- a/app/views/devise/sessions/new.html.haml
+++ b/app/views/devise/sessions/new.html.haml
@@ -4,7 +4,7 @@
= render 'devise/shared/signin_box'
-# Omniauth fits between signin/ldap signin and signup and does not have a surrounding box
- - if omniauth_enabled? && devise_mapping.omniauthable?
+ - if omniauth_enabled? && devise_mapping.omniauthable? && button_based_providers_enabled?
.clearfix.prepend-top-20
= render 'devise/shared/omniauth_box'