diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 18:10:35 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 18:10:35 +0000 |
| commit | 3597fb6d337baab5847863feedc98b433fb4000c (patch) | |
| tree | 7c2cf77f03fc2dc43af4198bdddc75221edacaac /app/policies/global_policy.rb | |
| parent | ec4abad65d774cfc94110577589d44de5da825de (diff) | |
| download | gitlab-ce-3597fb6d337baab5847863feedc98b433fb4000c.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/policies/global_policy.rb')
| -rw-r--r-- | app/policies/global_policy.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/policies/global_policy.rb b/app/policies/global_policy.rb index 35d38bac7fa..c3b4b163cb4 100644 --- a/app/policies/global_policy.rb +++ b/app/policies/global_policy.rb @@ -16,7 +16,7 @@ class GlobalPolicy < BasePolicy end condition(:password_expired, scope: :user) do - @user&.password_expired? + @user&.password_expired_if_applicable? end condition(:project_bot, scope: :user) { @user&.project_bot? } |