diff options
Diffstat (limited to 'app/policies/base_policy.rb')
-rw-r--r-- | app/policies/base_policy.rb | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/app/policies/base_policy.rb b/app/policies/base_policy.rb index 51694ec7c50..e32a889c906 100644 --- a/app/policies/base_policy.rb +++ b/app/policies/base_policy.rb @@ -55,14 +55,17 @@ class BasePolicy < DeclarativePolicy::Base prevent :read_cross_project end - # Policy extended in EE to also enable auditors - rule { admin }.enable :read_all_resources + rule { admin }.policy do + # Only for actual administrator accounts, behaviour affected by admin mode application setting + enable :admin_all_resources + # Policy extended in EE to also enable auditors + enable :read_all_resources + enable :change_repository_storage + end rule { default }.enable :read_cross_project condition(:is_gitlab_com) { ::Gitlab.dev_env_or_com? } - - rule { admin }.enable :change_repository_storage end BasePolicy.prepend_if_ee('EE::BasePolicy') |