diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-16 21:18:33 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-16 21:18:33 +0300 |
commit | f64a639bcfa1fc2bc89ca7db268f594306edfd7c (patch) | |
tree | a2c3c2ebcc3b45e596949db485d6ed18ffaacfa1 /app/policies/project_policy.rb | |
parent | bfbc3e0d6583ea1a91f627528bedc3d65ba4b10f (diff) |
Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc40
Diffstat (limited to 'app/policies/project_policy.rb')
-rw-r--r-- | app/policies/project_policy.rb | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/app/policies/project_policy.rb b/app/policies/project_policy.rb index aaf985d6c63..de80f2f72b8 100644 --- a/app/policies/project_policy.rb +++ b/app/policies/project_policy.rb @@ -156,6 +156,7 @@ class ProjectPolicy < BasePolicy metrics_dashboard analytics operations + security_and_compliance ] features.each do |f| @@ -203,8 +204,8 @@ class ProjectPolicy < BasePolicy rule { can?(:guest_access) }.policy do enable :read_project enable :create_merge_request_in - enable :read_board - enable :read_list + enable :read_issue_board + enable :read_issue_board_list enable :read_wiki enable :read_issue enable :read_label @@ -230,7 +231,7 @@ class ProjectPolicy < BasePolicy rule { guest & can?(:read_container_image) }.enable :build_read_container_image rule { can?(:reporter_access) }.policy do - enable :admin_board + enable :admin_issue_board enable :download_code enable :read_statistics enable :download_wiki_code @@ -239,7 +240,7 @@ class ProjectPolicy < BasePolicy enable :reopen_issue enable :admin_issue enable :admin_label - enable :admin_list + enable :admin_issue_board_list enable :admin_issue_link enable :read_commit_status enable :read_build @@ -318,7 +319,7 @@ class ProjectPolicy < BasePolicy rule { can?(:developer_access) }.policy do enable :create_package - enable :admin_board + enable :admin_issue_board enable :admin_merge_request enable :admin_milestone enable :update_merge_request @@ -368,7 +369,7 @@ class ProjectPolicy < BasePolicy rule { can?(:maintainer_access) }.policy do enable :destroy_package - enable :admin_board + enable :admin_issue_board enable :push_to_delete_protected_branch enable :update_snippet enable :admin_snippet @@ -428,8 +429,8 @@ class ProjectPolicy < BasePolicy rule { issues_disabled }.policy do prevent(*create_read_update_admin_destroy(:issue)) - prevent(*create_read_update_admin_destroy(:board)) - prevent(*create_read_update_admin_destroy(:list)) + prevent(*create_read_update_admin_destroy(:issue_board)) + prevent(*create_read_update_admin_destroy(:issue_board_list)) end rule { merge_requests_disabled | repository_disabled }.policy do @@ -506,8 +507,8 @@ class ProjectPolicy < BasePolicy rule { can?(:public_access) }.policy do enable :read_package enable :read_project - enable :read_board - enable :read_list + enable :read_issue_board + enable :read_issue_board_list enable :read_wiki enable :read_label enable :read_milestone @@ -640,6 +641,10 @@ class ProjectPolicy < BasePolicy enable :set_pipeline_variables end + rule { ~security_and_compliance_disabled & can?(:developer_access) }.policy do + enable :access_security_and_compliance + end + private def user_is_user? |