kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fix nesting on sessions/new.

This commit is contained in:
Bryce Johnson 2016-09-28 17:13:42 +02:00
parent 1fd0926082
commit 445711675c
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/views/devise/sessions/new.html.haml
View File

@ -12,12 +12,11 @@
- if signin_enabled? && signup_enabled?
= render 'devise/shared/signup_box'
- if omniauth_enabled? && devise_mapping.omniauthable? && button_based_providers_enabled?
.clearfix
= render 'devise/shared/omniauth_box'
-# Show a message if none of the mechanisms above are enabled
- if !signin_enabled? && !ldap_enabled? && !(omniauth_enabled? && devise_mapping.omniauthable?)
%div
No authentication methods configured.
- if omniauth_enabled? && devise_mapping.omniauthable? && button_based_providers_enabled?
.clearfix
= render 'devise/shared/omniauth_box'

2
spec/support/login_helpers.rb
View File

@ -33,7 +33,7 @@ module LoginHelpers
fill_in "user_login", with: user.email
fill_in "user_password", with: "12345678"
check 'user_remember_me' if remember
first('.login-box').click_button('Sign in')
click_button "Sign in"
Thread.current[:current_user] = user
end