Add latest changes from gitlab-org/gitlab@16-5-stable-eev16.5.0-rc42

1 files changed, 5 insertions, 3 deletions

diff --git a/app/policies/project_policy.rb b/app/policies/project_policy.rb
index a57b6f8daf7..20f88577d67 100644
--- a/app/policies/project_policy.rb
+++ b/app/policies/project_policy.rb
@@ -642,7 +642,6 @@ class ProjectPolicy < BasePolicy
     prevent(*create_read_update_admin_destroy(:build))
     prevent(*create_read_update_admin_destroy(:pipeline_schedule))
     prevent(*create_read_update_admin_destroy(:environment))
-    prevent(*create_read_update_admin_destroy(:cluster))
     prevent(*create_read_update_admin_destroy(:deployment))
   end
 
@@ -666,6 +665,7 @@ class ProjectPolicy < BasePolicy
     prevent :read_pipeline_schedule
     prevent(*create_read_update_admin_destroy(:feature_flag))
     prevent(:admin_feature_flags_user_lists)
+    prevent(*create_read_update_admin_destroy(:cluster))
   end
 
   rule { container_registry_disabled }.policy do
@@ -695,7 +695,6 @@ class ProjectPolicy < BasePolicy
     enable :read_merge_request
     enable :read_note
     enable :read_pipeline
-    enable :read_pipeline_schedule
     enable :read_environment
     enable :read_deployment
     enable :read_commit_status
@@ -712,7 +711,10 @@ class ProjectPolicy < BasePolicy
     enable :read_issue
   end
 
-  rule { can?(:public_access) & public_builds }.enable :read_ci_cd_analytics
+  rule { can?(:public_access) & public_builds }.policy do
+    enable :read_ci_cd_analytics
+    enable :read_pipeline_schedule
+  end
 
   rule { public_builds }.policy do
     enable :read_build