diff options
| author | Phil Hughes <me@iamphill.com> | 2018-05-01 11:49:08 +0300 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-05-01 11:49:08 +0300 |
| commit | 36043ab9f1ebe4f32e0d3192b74c902aec4f266a (patch) | |
| tree | 56f776018927e24528ed2596b5851d6ccc5ea011 | |
| parent | 4e2787a66746e52242c664d0a48c27ba90ef4037 (diff) | |
| parent | a00d154512001acd4018aa5554e0642c94ec1695 (diff) | |
Merge branch 'update-timeline-icon-for-description-edit' into 'master'
Update timeline icon for description edit
Closes #39946
See merge request gitlab-org/gitlab-ce!18633
| -rw-r--r-- | app/helpers/system_note_helper.rb | 6 | ||||
| -rw-r--r-- | changelogs/unreleased/update-timeline-icon-for-description-edit.yml | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/app/helpers/system_note_helper.rb b/app/helpers/system_note_helper.rb index 00fe67d6ffb..5b4a141dbcf 100644 --- a/app/helpers/system_note_helper.rb +++ b/app/helpers/system_note_helper.rb @@ -1,14 +1,14 @@ module SystemNoteHelper ICON_NAMES_BY_ACTION = { 'commit' => 'commit', - 'description' => 'pencil', + 'description' => 'pencil-square', 'merge' => 'git-merge', 'merged' => 'git-merge', 'opened' => 'issue-open', 'closed' => 'issue-close', 'time_tracking' => 'timer', 'assignee' => 'user', - 'title' => 'pencil', + 'title' => 'pencil-square', 'task' => 'task-done', 'label' => 'label', 'cross_reference' => 'comment-dots', @@ -18,7 +18,7 @@ module SystemNoteHelper 'milestone' => 'clock', 'discussion' => 'comment', 'moved' => 'arrow-right', - 'outdated' => 'pencil', + 'outdated' => 'pencil-square', 'duplicate' => 'issue-duplicate', 'locked' => 'lock', 'unlocked' => 'lock-open' diff --git a/changelogs/unreleased/update-timeline-icon-for-description-edit.yml b/changelogs/unreleased/update-timeline-icon-for-description-edit.yml new file mode 100644 index 00000000000..560db00e503 --- /dev/null +++ b/changelogs/unreleased/update-timeline-icon-for-description-edit.yml @@ -0,0 +1,5 @@ +--- +title: Update timeline icon for description edit +merge_request: 18633 +author: George Tsiolis +type: changed |