diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-03 21:10:03 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-03 21:10:03 +0300 |
| commit | b6847c621ff246e6abceb90545d5a608318762d6 (patch) | |
| tree | 460da2a6c2be2e4f5164c2bba1851b66260f850d /app/policies | |
| parent | c08d9c22569d1c9e7c7737e183969593394133d9 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/policies')
| -rw-r--r-- | app/policies/base_policy.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/policies/base_policy.rb b/app/policies/base_policy.rb index ce3e5b0195c..2c26ba565ab 100644 --- a/app/policies/base_policy.rb +++ b/app/policies/base_policy.rb @@ -25,8 +25,7 @@ class BasePolicy < DeclarativePolicy::Base with_options scope: :user, score: 0 condition(:inactive) do Feature.enabled?(:inactive_policy_condition, default_enabled: true) && - @user && - !@user&.active_for_authentication? + @user&.confirmation_required_on_sign_in? || @user&.access_locked? end with_options scope: :user, score: 0 |