Add latest changes from gitlab-org/gitlab@master

2 files changed, 2 insertions, 6 deletions

diff --git a/app/controllers/concerns/send_file_upload.rb b/app/controllers/concerns/send_file_upload.rb
index 2141b257b40..c8b987da58c 100644
--- a/app/controllers/concerns/send_file_upload.rb
+++ b/app/controllers/concerns/send_file_upload.rb
@@ -63,8 +63,7 @@ module SendFileUpload
   private
 
   def image_scaling_request?(file_upload)
-    (avatar_safe_for_scaling?(file_upload) || pwa_icon_safe_for_scaling?(file_upload)) &&
-      scaling_allowed_by_feature_flags?(file_upload)
+    avatar_safe_for_scaling?(file_upload) || pwa_icon_safe_for_scaling?(file_upload)
   end
 
   def pwa_icon_safe_for_scaling?(file_upload)
@@ -90,8 +89,4 @@ module SendFileUpload
   def valid_image_scaling_width?(allowed_scalar_widths)
     allowed_scalar_widths.include?(params[:width]&.to_i)
   end
-
-  def scaling_allowed_by_feature_flags?(file_upload)
-    Feature.enabled?(:dynamic_image_resizing, type: :ops)
-  end
 end
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index a6bc754d09e..0a6ac2a25a4 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -39,6 +39,7 @@ class ProjectsController < Projects::ApplicationController
   before_action do
     push_frontend_feature_flag(:highlight_js, @project)
     push_frontend_feature_flag(:synchronize_fork, @project&.fork_source)
+    push_frontend_feature_flag(:remove_monitor_metrics, @project)
     push_licensed_feature(:file_locks) if @project.present? && @project.licensed_feature_available?(:file_locks)
     push_licensed_feature(:security_orchestration_policies) if @project.present? && @project.licensed_feature_available?(:security_orchestration_policies)
     push_force_frontend_feature_flag(:work_items, @project&.work_items_feature_flag_enabled?)