diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-26 00:10:28 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-26 00:10:28 +0000 |
commit | 34f4e3a0546d07f26530b1169c072d473bb5be8a (patch) | |
tree | e3c0c3da627ef8e614ebec0256b899a80c8c2ffa /app/policies/group_policy.rb | |
parent | 9b5b5f51f5c8c24c2e5dbfd79c823326a91fe567 (diff) | |
download | gitlab-ce-34f4e3a0546d07f26530b1169c072d473bb5be8a.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/policies/group_policy.rb')
-rw-r--r-- | app/policies/group_policy.rb | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/app/policies/group_policy.rb b/app/policies/group_policy.rb index 44393539327..a264ff48c08 100644 --- a/app/policies/group_policy.rb +++ b/app/policies/group_policy.rb @@ -82,10 +82,6 @@ class GroupPolicy < Namespaces::GroupProjectNamespaceSharedPolicy Feature.disabled?(:runner_registration_control) || Gitlab::CurrentSettings.valid_runner_registrars.include?('group') end - condition(:change_prevent_sharing_groups_outside_hierarchy_available) do - change_prevent_sharing_groups_outside_hierarchy_available? - end - rule { can?(:read_group) & design_management_enabled }.policy do enable :read_design_activity end @@ -196,6 +192,7 @@ class GroupPolicy < Namespaces::GroupProjectNamespaceSharedPolicy enable :set_note_created_at enable :set_emails_disabled + enable :change_prevent_sharing_groups_outside_hierarchy enable :change_new_user_signups_cap enable :update_default_branch_protection enable :create_deploy_token @@ -204,10 +201,6 @@ class GroupPolicy < Namespaces::GroupProjectNamespaceSharedPolicy enable :owner_access end - rule { owner & change_prevent_sharing_groups_outside_hierarchy_available }.policy do - enable :change_prevent_sharing_groups_outside_hierarchy - end - rule { can?(:read_nested_project_resources) }.policy do enable :read_group_activity enable :read_group_issues @@ -335,10 +328,6 @@ class GroupPolicy < Namespaces::GroupProjectNamespaceSharedPolicy def valid_dependency_proxy_deploy_token @user.is_a?(DeployToken) && @user&.valid_for_dependency_proxy? && @user&.has_access_to_group?(@subject) end - - def change_prevent_sharing_groups_outside_hierarchy_available? - true - end end GroupPolicy.prepend_mod_with('GroupPolicy') |