diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 18:10:18 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 18:10:18 +0300 |
commit | 520f3178665de5e7d313d332989cd445da83817b (patch) | |
tree | 9db17960cfdd6f6be1deaee57d32e7d7956f2d84 /app/policies/user_policy.rb | |
parent | 3b963d69199b2e4dd0a0c0b64efcf715242a5d8b (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/policies/user_policy.rb')
-rw-r--r-- | app/policies/user_policy.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/policies/user_policy.rb b/app/policies/user_policy.rb index 6ebafca9885..c9dfa98b285 100644 --- a/app/policies/user_policy.rb +++ b/app/policies/user_policy.rb @@ -25,6 +25,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 end UserPolicy.prepend_if_ee('EE::UserPolicy') |