Add latest changes from gitlab-org/gitlab@master

1 files changed, 1 insertions, 16 deletions

diff --git a/app/policies/packages/policies/project_policy.rb b/app/policies/packages/policies/project_policy.rb
index 0fb5953f2aa..35161fd95f1 100644
--- a/app/policies/packages/policies/project_policy.rb
+++ b/app/policies/packages/policies/project_policy.rb
@@ -7,25 +7,10 @@ module Packages
 
       overrides(:read_package)
 
-      condition(:package_registry_access_level_feature_flag_enabled, scope: :subject) do
-        ::Feature.enabled?(:package_registry_access_level, @subject)
-      end
-
       condition(:packages_enabled_for_everyone, scope: :subject) do
         @subject.package_registry_access_level == ProjectFeature::PUBLIC
       end
 
-      # This rule can be removed if the `package_registry_access_level` feature flag is removed.
-      # Reason: If the feature flag is globally enabled, this rule will never be executed.
-      rule { anonymous & ~project.public_project & ~package_registry_access_level_feature_flag_enabled }.prevent_all
-
-      # This rule can be removed if the `package_registry_access_level` feature flag is removed.
-      # Reason: If the feature flag is globally enabled, this rule will never be executed.
-      rule do
-        ~project.public_project & ~project.internal_access &
-          ~project.project_allowed_for_job_token & ~package_registry_access_level_feature_flag_enabled
-      end.prevent_all
-
       rule { project.packages_disabled }.policy do
         prevent(:read_package)
       end
@@ -46,7 +31,7 @@ module Packages
         enable :read_package
       end
 
-      rule { package_registry_access_level_feature_flag_enabled & packages_enabled_for_everyone }.policy do
+      rule { packages_enabled_for_everyone }.policy do
         enable :read_package
       end
     end