Merge branch...

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

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