From 142890d5bbefa7b1e1b30f263f9ad67d9d496d29 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 26 Nov 2020 12:09:48 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/policies/user_policy.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'app/policies/user_policy.rb') diff --git a/app/policies/user_policy.rb b/app/policies/user_policy.rb index 70e8fb32064..48c2bd3f0bd 100644 --- a/app/policies/user_policy.rb +++ b/app/policies/user_policy.rb @@ -13,6 +13,9 @@ class UserPolicy < BasePolicy desc "The user is blocked" condition(:blocked_user, scope: :subject, score: 0) { @subject.blocked? } + desc "The user is unconfirmed" + condition(:unconfirmed_user, scope: :subject, score: 0) { !@subject.confirmed? } + rule { ~restricted_public_level }.enable :read_user rule { ~anonymous }.enable :read_user @@ -25,7 +28,7 @@ class UserPolicy < BasePolicy end rule { default }.enable :read_user_profile - rule { (private_profile | blocked_user) & ~(user_is_self | admin) }.prevent :read_user_profile + rule { (private_profile | blocked_user | unconfirmed_user) & ~(user_is_self | admin) }.prevent :read_user_profile rule { user_is_self | admin }.enable :disable_two_factor rule { (user_is_self | admin) & ~blocked }.enable :create_user_personal_access_token end -- cgit v1.2.3