diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-04-06 17:13:42 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-04-06 17:13:42 +0300 |
| commit | fe17613dec7ce0c97ca2c487f27352532968f757 (patch) | |
| tree | c5de4786a53741bdab870e1fec62dd625467a227 /app/controllers | |
| parent | 997c9006d63a3fd8ffe264dec0cff2cb935904ef (diff) | |
| parent | ec144bddb9ca8d1e72de4b45c1c0d726556cd9a4 (diff) | |
Merge branch 'blackst0ne-rails5-update-skip-before-action-in-authenticates-with-two-factor-concern' into 'master'
[Rails5] Add `raise: false` to skip_before_action in authenticates_with_two_factor.rb
See merge request gitlab-org/gitlab-ce!18221
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/concerns/authenticates_with_two_factor.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/concerns/authenticates_with_two_factor.rb b/app/controllers/concerns/authenticates_with_two_factor.rb index 2753f83c3cf..2fdf346ef44 100644 --- a/app/controllers/concerns/authenticates_with_two_factor.rb +++ b/app/controllers/concerns/authenticates_with_two_factor.rb @@ -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 |