Add latest changes from gitlab-org/gitlab@master

This commit is contained in:
GitLab Bot
2022-06-15 09:09:28 +00:00
parent e75da32ffd
commit 74e6480896
48 changed files with 730 additions and 277 deletions

View File

@ -6,7 +6,7 @@ module SystemNoteHelper
'unapproved' => 'unapproval',
'cherry_pick' => 'cherry-pick-commit',
'commit' => 'commit',
'description' => 'pencil-square',
'description' => 'pencil',
'merge' => 'git-merge',
'merged' => 'git-merge',
'opened' => 'issues',
@ -14,7 +14,7 @@ module SystemNoteHelper
'time_tracking' => 'timer',
'assignee' => 'user',
'reviewer' => 'user',
'title' => 'pencil-square',
'title' => 'pencil',
'task' => 'task-done',
'label' => 'label',
'cross_reference' => 'comment-dots',
@ -24,7 +24,7 @@ module SystemNoteHelper
'milestone' => 'clock',
'discussion' => 'comment',
'moved' => 'arrow-right',
'outdated' => 'pencil-square',
'outdated' => 'pencil',
'pinned_embed' => 'thumbtack',
'duplicate' => 'duplicate',
'locked' => 'lock',
@ -40,7 +40,7 @@ module SystemNoteHelper
'new_alert_added' => 'warning',
'severity' => 'information-o',
'cloned' => 'documents',
'issue_type' => 'pencil-square',
'issue_type' => 'pencil',
'attention_requested' => 'user',
'attention_request_removed' => 'user',
'contact' => 'users',