1 files changed, 15 insertions, 39 deletions
diff --git a/app/views/devise/sessions/new.html.haml b/app/views/devise/sessions/new.html.haml
index b70b0d66172..89e4e229ac0 100644
--- a/app/views/devise/sessions/new.html.haml
+++ b/app/views/devise/sessions/new.html.haml
@@ -1,42 +1,18 @@
-.login-box
-  .login-heading
-    %h3 Sign in
-  .login-body
-    - if ldap_enabled? && gitlab_config.signin_enabled
-      %ul.nav.nav-tabs
-        %li.active
-          = link_to 'LDAP', '#tab-ldap', 'data-toggle' => 'tab'
-        %li
-          = link_to 'Standard', '#tab-signin', 'data-toggle' => 'tab'
-      .tab-content
-        %div#tab-ldap.tab-pane.active
-          = render partial: 'devise/sessions/new_ldap'
-        %div#tab-signin.tab-pane
-          = render partial: 'devise/sessions/new_base'
+%div
+  - if signin_enabled? || ldap_enabled?
+    = render 'devise/shared/signin_box'
 
-    - elsif ldap_enabled?
-      = render partial: 'devise/sessions/new_ldap'
-    - elsif gitlab_config.signin_enabled
-      = render partial: 'devise/sessions/new_base'
-    - else
-      %div
-        No authentication methods configured.
+  -# Omniauth fits between signin/ldap signin and signup and does not have a surrounding box
+  - if Gitlab.config.omniauth.enabled && devise_mapping.omniauthable?
+    .clearfix.prepend-top-20
+      = render 'devise/shared/omniauth_box'
 
-    = render 'devise/sessions/oauth_providers' if Gitlab.config.omniauth.enabled && devise_mapping.omniauthable?
+  -# Signup only makes sense if you can also sign-in
+  - if signin_enabled? && signup_enabled?
+    .prepend-top-20
+      = render 'devise/shared/signup_box'
 
-  .login-footer
-    - if gitlab_config.signup_enabled
-      %p
-        %span.light
-          Don't have an account?
-        %strong
-          = link_to "Sign up", new_registration_path(resource_name)
-
-    %p
-      %span.light Did not receive confirmation email?
-      = link_to "Send again", new_confirmation_path(resource_name)
-
-
-    - if extra_config.has_key?('sign_in_text')
-      %hr
-      = markdown(extra_config.sign_in_text)
+  -# Show a message if none of the mechanisms above are enabled
+  - if !signin_enabled? && !ldap_enabled? && !(Gitlab.config.omniauth.enabled && devise_mapping.omniauthable?)
+    %div
+      No authentication methods configured.