Add latest changes from gitlab-org/gitlab@master

2 files changed, 11 insertions, 15 deletions

diff --git a/app/views/admin/sessions/_signin_box.html.haml b/app/views/admin/sessions/_signin_box.html.haml
deleted file mode 100644
index 1d19915d3c5..00000000000
--- a/app/views/admin/sessions/_signin_box.html.haml
+++ /dev/null
@@ -1,11 +0,0 @@
-- if any_form_based_providers_enabled?
-
-  - if password_authentication_enabled_for_web?
-    .login-box.tab-pane{ id: 'login-pane', role: 'tabpanel' }
-      .login-body
-        = render 'admin/sessions/new_base'
-
-- elsif password_authentication_enabled_for_web?
-  .login-box.tab-pane.active{ id: 'login-pane', role: 'tabpanel' }
-    .login-body
-      = render 'admin/sessions/new_base'
diff --git a/app/views/admin/sessions/new.html.haml b/app/views/admin/sessions/new.html.haml
index 73028e78ea5..a1d440f2cfd 100644
--- a/app/views/admin/sessions/new.html.haml
+++ b/app/views/admin/sessions/new.html.haml
@@ -7,9 +7,16 @@
       #signin-container
         = render 'admin/sessions/tabs_normal'
         .tab-content
-          - if password_authentication_enabled_for_web?
-            = render 'admin/sessions/signin_box'
-          - else
-            -# Show a message if none of the mechanisms above are enabled
+          - if !current_user.require_password_creation_for_web?
+            .login-box.tab-pane.active{ id: 'login-pane', role: 'tabpanel' }
+              .login-body
+                = render 'admin/sessions/new_base'
+
+          - if omniauth_enabled? && button_based_providers_enabled?
+            .clearfix
+              = render 'devise/shared/omniauth_box'
+
+          -# Show a message if none of the mechanisms above are enabled
+          - if current_user.require_password_creation_for_web? && !omniauth_enabled?
             .prepend-top-default.center
               = _('No authentication methods configured.')