summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryce Johnson <bryce@gitlab.com>2016-10-17 20:04:21 +0200
committerBryce Johnson <bryce@gitlab.com>2016-10-18 11:12:41 +0200
commit357ff6700dcb0e13c5888a9157f8890654e5ca4a (patch)
tree023dda00160a540bc8cc4ee0cdea407dcc8e133b
parent60e6eca0d0b0926aeb248332c88be886f2f8e69f (diff)
downloadgitlab-ce-357ff6700dcb0e13c5888a9157f8890654e5ca4a.tar.gz
Contain normal signin in loginbox.
-rw-r--r--app/views/devise/shared/_signin_box.html.haml4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/views/devise/shared/_signin_box.html.haml b/app/views/devise/shared/_signin_box.html.haml
index 736f5b3ffc9..86edaf14e43 100644
--- a/app/views/devise/shared/_signin_box.html.haml
+++ b/app/views/devise/shared/_signin_box.html.haml
@@ -13,4 +13,6 @@
= render 'devise/sessions/new_base'
- elsif signin_enabled?
- = render 'devise/sessions/new_base'
+ .login-box.tab-pane.active{id: 'login-pane', role: 'tabpanel'}
+ .login-body
+ = render 'devise/sessions/new_base'