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

Merge branch 'blackst0ne-rails5-update-skip-before-action-in-authenticates-with-two-factor-concern' into 'master'

Browse source 
[Rails5] Add `raise: false` to skip_before_action in authenticates_with_two_factor.rb

See merge request gitlab-org/gitlab-ce!18221
This commit is contained in:
Douwe Maan 2018-04-06 14:13:42 +00:00
commit fe17613dec
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/concerns/authenticates_with_two_factor.rb
View file

@ -10,7 +10,7 @@ module AuthenticatesWithTwoFactor
# This action comes from DeviseController, but because we call `sign_in`
# manually, not skipping this action would cause a "You are already signed
# in." error message to be shown upon successful login.
skip_before_action :require_no_authentication, only: [:create]
skip_before_action :require_no_authentication, only: [:create], raise: false
end
# Store the user's ID in the session for later retrieval and render the