Add latest changes from gitlab-org/gitlab@master

2 files changed, 13 insertions, 4 deletions

diff --git a/app/helpers/packages_helper.rb b/app/helpers/packages_helper.rb
index dec1943db54..8861f1ffe9a 100644
--- a/app/helpers/packages_helper.rb
+++ b/app/helpers/packages_helper.rb
@@ -69,6 +69,11 @@ module PackagesHelper
     Ability.allowed?(current_user, :admin_package, project)
   end
 
+  def show_group_package_registry_settings(group)
+    group.packages_feature_enabled? &&
+    Ability.allowed?(current_user, :admin_group, group)
+  end
+
   def cleanup_settings_data
     {
       project_id: @project.id,
diff --git a/app/helpers/system_note_helper.rb b/app/helpers/system_note_helper.rb
index a1b6e896475..3d31d697452 100644
--- a/app/helpers/system_note_helper.rb
+++ b/app/helpers/system_note_helper.rb
@@ -2,13 +2,13 @@
 
 module SystemNoteHelper
   ICON_NAMES_BY_ACTION = {
-    'approved' => 'approval',
+    'approved' => 'check',
     'unapproved' => 'unapproval',
     'cherry_pick' => 'cherry-pick-commit',
     'commit' => 'commit',
     'description' => 'pencil',
-    'merge' => 'git-merge',
-    'merged' => 'git-merge',
+    'merge' => 'merge',
+    'merged' => 'merge',
     'opened' => 'issues',
     'closed' => 'issue-close',
     'time_tracking' => 'timer',
@@ -51,7 +51,11 @@ module SystemNoteHelper
   }.freeze
 
   def system_note_icon_name(note)
-    ICON_NAMES_BY_ACTION[note.system_note_metadata&.action]
+    if note.system_note_metadata&.action == 'closed' && note.for_merge_request?
+      'merge-request-close'
+    else
+      ICON_NAMES_BY_ACTION[note.system_note_metadata&.action]
+    end
   end
 
   def icon_for_system_note(note)