Merge branch 'fix-cherry-pick-icon' into 'master'

Fix cherry pick icon See merge request gitlab-org/gitlab!26009

Merge branch 'fix-cherry-pick-icon' into 'master'
Fix cherry pick icon See merge request gitlab-org/gitlab!26009
6953eb49 · Sean McGivern · d1fb2254 · 07e10476 · 6953eb49
Commit 6953eb49 authored Feb 27, 2020 by Sean McGivern
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

app/helpers/system_note_helper.rb app/helpers/system_note_helper.rb +1 -1

No files found.
--- a/app/helpers/system_note_helper.rb
+++ b/app/helpers/system_note_helper.rb
@@ -2,7 +2,7 @@

 module SystemNoteHelper
  ICON_NAMES_BY_ACTION = {
-    'cherry_pick' => 'link',
+    'cherry_pick' => 'cherry-pick-commit',
    'commit' => 'commit',
    'description' => 'pencil-square',
    'merge' => 'git-merge',