diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-23 00:08:48 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-23 00:08:48 +0300 |
| commit | b6ec12ceca58b12d974d46d0579742f4d3cdb9d7 (patch) | |
| tree | c440d6195c651bac465cd37bc0d88fbd3ebefccc /app/helpers/system_note_helper.rb | |
| parent | 3832718d895bf8268f3e3aac85948e2792769345 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers/system_note_helper.rb')
| -rw-r--r-- | app/helpers/system_note_helper.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/helpers/system_note_helper.rb b/app/helpers/system_note_helper.rb index 51cbe93513d..05d698a6d99 100644 --- a/app/helpers/system_note_helper.rb +++ b/app/helpers/system_note_helper.rb @@ -2,6 +2,7 @@ module SystemNoteHelper ICON_NAMES_BY_ACTION = { + 'cherry_pick' => 'link', 'commit' => 'commit', 'description' => 'pencil-square', 'merge' => 'git-merge', |