Add latest changes from gitlab-org/gitlab@master

3 files changed, 12 insertions, 2 deletions

diff --git a/app/helpers/environment_helper.rb b/app/helpers/environment_helper.rb
index d914c63b753..00109212934 100644
--- a/app/helpers/environment_helper.rb
+++ b/app/helpers/environment_helper.rb
@@ -79,7 +79,7 @@ module EnvironmentHelper
       can_destroy_environment: can_destroy_environment?(environment),
       can_stop_environment: can?(current_user, :stop_environment, environment),
       can_admin_environment: can?(current_user, :admin_environment, project),
-      environment_metrics_path: project_metrics_dashboard_path(project, environment: environment),
+      **environment_metrics_path(project, environment),
       environments_fetch_path: project_environments_path(project, format: :json),
       environment_edit_path: edit_project_environment_path(project, environment),
       environment_stop_path: stop_project_environment_path(project, environment),
@@ -96,4 +96,10 @@ module EnvironmentHelper
   def environments_detail_data_json(user, project, environment)
     environments_detail_data(user, project, environment).to_json
   end
+
+  def environment_metrics_path(project, environment)
+    return {} if Feature.enabled?(:remove_monitor_metrics)
+
+    { environment_metrics_path: project_metrics_dashboard_path(project, environment: environment) }
+  end
 end
diff --git a/app/helpers/environments_helper.rb b/app/helpers/environments_helper.rb
index 5bf4fa2ffcc..525fdd3e9f6 100644
--- a/app/helpers/environments_helper.rb
+++ b/app/helpers/environments_helper.rb
@@ -22,6 +22,8 @@ module EnvironmentsHelper
   end
 
   def metrics_data(project, environment)
+    return {} if Feature.enabled?(:remove_monitor_metrics)
+
     metrics_data = {}
     metrics_data.merge!(project_metrics_data(project)) if project
     metrics_data.merge!(environment_metrics_data(environment, project)) if environment
diff --git a/app/helpers/system_note_helper.rb b/app/helpers/system_note_helper.rb
index 3d31d697452..d7ca76f6a8a 100644
--- a/app/helpers/system_note_helper.rb
+++ b/app/helpers/system_note_helper.rb
@@ -7,8 +7,8 @@ module SystemNoteHelper
     'cherry_pick' => 'cherry-pick-commit',
     'commit' => 'commit',
     'description' => 'pencil',
-    'merge' => 'merge',
     'merged' => 'merge',
+    'merge' => 'merge',
     'opened' => 'issues',
     'closed' => 'issue-close',
     'time_tracking' => 'timer',
@@ -53,6 +53,8 @@ module SystemNoteHelper
   def system_note_icon_name(note)
     if note.system_note_metadata&.action == 'closed' && note.for_merge_request?
       'merge-request-close'
+    elsif note.system_note_metadata&.action == 'merge' && note.for_merge_request?
+      'mr-system-note-empty'
     else
       ICON_NAMES_BY_ACTION[note.system_note_metadata&.action]
     end