diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-07-31 10:23:50 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-07-31 10:23:50 +0200 |
| commit | 95f9d6d83bcb7a9f45601f828c34301e536fc195 (patch) | |
| tree | ed5447c85eb35ac9b7a363dd5a83514578c2fb3e /app/helpers/system_note_helper.rb | |
| parent | c92881c394a482bdb6d3f0f0a5f3cc95d5eed1fc (diff) | |
| parent | 6fe736f2c927340ed8cf827080db781f7c8adcdf (diff) | |
| download | gitlab-ce-95f9d6d83bcb7a9f45601f828c34301e536fc195.tar.gz | |
Merge branch 'master' into issue-discussions-refactor
# Conflicts:
# app/controllers/concerns/notes_actions.rb
# spec/features/task_lists_spec.rb
# spec/support/features/issuable_slash_commands_shared_examples.rb
Diffstat (limited to 'app/helpers/system_note_helper.rb')
| -rw-r--r-- | app/helpers/system_note_helper.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/helpers/system_note_helper.rb b/app/helpers/system_note_helper.rb index 69366825124..c98f65c7644 100644 --- a/app/helpers/system_note_helper.rb +++ b/app/helpers/system_note_helper.rb @@ -18,7 +18,8 @@ module SystemNoteHelper 'milestone' => 'icon_clock_o', 'discussion' => 'icon_comment_o', 'moved' => 'icon_arrow_circle_o_right', - 'outdated' => 'icon_edit' + 'outdated' => 'icon_edit', + 'duplicate' => 'icon_clone' }.freeze def system_note_icon_name(note) |