Merge branch 'rs-skip-2fa-on-signout' into 'master'
Skip the 2FA requirement during logout See merge request !2581
This commit is contained in:
commit
614025da38
|
@ -5,6 +5,8 @@ v 8.5.0 (unreleased)
|
|||
- Ignore binary files in code search to prevent Error 500 (Stan Hu)
|
||||
- Upgrade gitlab_git to 7.2.23 to fix commit message mentions in first branch push
|
||||
- New UI for pagination
|
||||
- Don't prevent sign out when 2FA enforcement is enabled and user hasn't yet
|
||||
set it up
|
||||
- Fix diff comments loaded by AJAX to load comment with diff in discussion tab
|
||||
- Whitelist raw "abbr" elements when parsing Markdown (Benedict Etzel)
|
||||
- Don't vendor minified JS
|
||||
|
|
|
@ -2,6 +2,8 @@ class SessionsController < Devise::SessionsController
|
|||
include AuthenticatesWithTwoFactor
|
||||
include Recaptcha::ClientHelper
|
||||
|
||||
skip_before_action :check_2fa_requirement, only: [:destroy]
|
||||
|
||||
prepend_before_action :authenticate_with_two_factor, only: [:create]
|
||||
prepend_before_action :store_redirect_path, only: [:new]
|
||||
before_action :auto_sign_in_with_provider, only: [:new]
|
||||
|
|
Loading…
Reference in New Issue