diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-11 03:11:52 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-11 03:11:52 +0300 |
| commit | 29b547f00429a063b266f6e6e478bba92c6a167a (patch) | |
| tree | 5fbb39c281630f5c140c132b8a8894df1e92a516 /app/controllers | |
| parent | 5f722a35635ac0a883d17ed6173cbebdb9a87477 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/concerns/enforces_two_factor_authentication.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/concerns/enforces_two_factor_authentication.rb b/app/controllers/concerns/enforces_two_factor_authentication.rb index 539feb3cf1c..24475909b62 100644 --- a/app/controllers/concerns/enforces_two_factor_authentication.rb +++ b/app/controllers/concerns/enforces_two_factor_authentication.rb @@ -73,7 +73,7 @@ module EnforcesTwoFactorAuthentication end def skip_two_factor? - session[:skip_two_factor] && session[:skip_two_factor] > Time.current + session[:skip_two_factor] && session[:skip_two_factor].future? end def two_factor_verifier |