Add latest changes from gitlab-org/gitlab@16-8-stable-eev16.8.0-rc42

2 files changed, 9 insertions, 0 deletions

diff --git a/app/controllers/projects/settings/packages_and_registries_controller.rb b/app/controllers/projects/settings/packages_and_registries_controller.rb
index 76c9cead360..5c352866c8d 100644
--- a/app/controllers/projects/settings/packages_and_registries_controller.rb
+++ b/app/controllers/projects/settings/packages_and_registries_controller.rb
@@ -7,6 +7,7 @@ module Projects
 
       before_action :authorize_admin_project!
       before_action :packages_and_registries_settings_enabled!
+      before_action :set_feature_flag_packages_protected_packages, only: :show
 
       feature_category :package_registry
       urgency :low
@@ -30,6 +31,10 @@ module Projects
         render_404 unless Gitlab.config.registry.enabled &&
           can?(current_user, :admin_container_image, project)
       end
+
+      def set_feature_flag_packages_protected_packages
+        push_frontend_feature_flag(:packages_protected_packages, project)
+      end
     end
   end
 end
diff --git a/app/controllers/projects/settings/repository_controller.rb b/app/controllers/projects/settings/repository_controller.rb
index 38b23b24c9a..6a10d603ad7 100644
--- a/app/controllers/projects/settings/repository_controller.rb
+++ b/app/controllers/projects/settings/repository_controller.rb
@@ -7,6 +7,10 @@ module Projects
       before_action :authorize_admin_project!
       before_action :define_variables, only: [:create_deploy_token]
 
+      before_action do
+        push_frontend_feature_flag(:add_branch_rule, @project)
+      end
+
       feature_category :source_code_management, [:show, :cleanup, :update]
       feature_category :continuous_delivery, [:create_deploy_token]
       urgency :low, [:show, :create_deploy_token]