diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-19 10:33:21 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-19 10:33:21 +0300 |
commit | 36a59d088eca61b834191dacea009677a96c052f (patch) | |
tree | e4f33972dab5d8ef79e3944a9f403035fceea43f /app/helpers/todos_helper.rb | |
parent | a1761f15ec2cae7c7f7bbda39a75494add0dfd6f (diff) |
Add latest changes from gitlab-org/gitlab@15-0-stable-eev15.0.0-rc42
Diffstat (limited to 'app/helpers/todos_helper.rb')
-rw-r--r-- | app/helpers/todos_helper.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/app/helpers/todos_helper.rb b/app/helpers/todos_helper.rb index 60bf79f3114..d3cc922423d 100644 --- a/app/helpers/todos_helper.rb +++ b/app/helpers/todos_helper.rb @@ -17,12 +17,11 @@ module TodosHelper case todo.action when Todo::ASSIGNED then todo.self_added? ? 'assigned' : 'assigned you' when Todo::REVIEW_REQUESTED then 'requested a review of' - when Todo::MENTIONED then "mentioned #{todo_action_subject(todo)} on" + when Todo::MENTIONED, Todo::DIRECTLY_ADDRESSED then "mentioned #{todo_action_subject(todo)} on" when Todo::BUILD_FAILED then 'The pipeline failed in' when Todo::MARKED then 'added a todo for' when Todo::APPROVAL_REQUIRED then "set #{todo_action_subject(todo)} as an approver for" when Todo::UNMERGEABLE then 'Could not merge' - when Todo::DIRECTLY_ADDRESSED then "directly addressed #{todo_action_subject(todo)} on" when Todo::MERGE_TRAIN_REMOVED then "Removed from Merge Train:" when Todo::ATTENTION_REQUESTED then 'requested your attention on' end @@ -151,8 +150,7 @@ module TodosHelper { id: Todo::REVIEW_REQUESTED, text: 'Review requested' }, { id: Todo::MENTIONED, text: 'Mentioned' }, { id: Todo::MARKED, text: 'Added' }, - { id: Todo::BUILD_FAILED, text: 'Pipelines' }, - { id: Todo::DIRECTLY_ADDRESSED, text: 'Directly addressed' } + { id: Todo::BUILD_FAILED, text: 'Pipelines' } ] end |