From 3597fb6d337baab5847863feedc98b433fb4000c Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 16 Jun 2021 18:10:35 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/policies/base_policy.rb | 2 +- app/policies/concerns/policy_actor.rb | 2 +- app/policies/global_policy.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'app/policies') diff --git a/app/policies/base_policy.rb b/app/policies/base_policy.rb index ea1ea87ff2f..77897c5807f 100644 --- a/app/policies/base_policy.rb +++ b/app/policies/base_policy.rb @@ -67,7 +67,7 @@ class BasePolicy < DeclarativePolicy::Base rule { default }.enable :read_cross_project - condition(:is_gitlab_com) { ::Gitlab.dev_env_or_com? } + condition(:is_gitlab_com, score: 0, scope: :global) { ::Gitlab.dev_env_or_com? } end BasePolicy.prepend_mod_with('BasePolicy') diff --git a/app/policies/concerns/policy_actor.rb b/app/policies/concerns/policy_actor.rb index 513bb85f538..8fa09683b06 100644 --- a/app/policies/concerns/policy_actor.rb +++ b/app/policies/concerns/policy_actor.rb @@ -85,7 +85,7 @@ module PolicyActor false end - def password_expired? + def password_expired_if_applicable? false end 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? } -- cgit v1.2.1