From 0ab6d56c15ebf4a12981556c7d3bc53d9b62cdb9 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 9 Nov 2020 12:09:24 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/policies/user_policy.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'app/policies/user_policy.rb') diff --git a/app/policies/user_policy.rb b/app/policies/user_policy.rb index 61030b6d5e6..70e8fb32064 100644 --- a/app/policies/user_policy.rb +++ b/app/policies/user_policy.rb @@ -27,6 +27,7 @@ class UserPolicy < BasePolicy rule { default }.enable :read_user_profile rule { (private_profile | blocked_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 UserPolicy.prepend_if_ee('EE::UserPolicy') -- cgit v1.2.3