diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-20 14:10:13 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-20 14:10:13 +0300 |
commit | 0ea3fcec397b69815975647f5e2aa5fe944a8486 (patch) | |
tree | 7979381b89d26011bcf9bdc989a40fcc2f1ed4ff /app/helpers/todos_helper.rb | |
parent | 72123183a20411a36d607d70b12d57c484394c8e (diff) |
Add latest changes from gitlab-org/gitlab@15-1-stable-eev15.1.0-rc42
Diffstat (limited to 'app/helpers/todos_helper.rb')
-rw-r--r-- | app/helpers/todos_helper.rb | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/app/helpers/todos_helper.rb b/app/helpers/todos_helper.rb index d3cc922423d..8529959f73c 100644 --- a/app/helpers/todos_helper.rb +++ b/app/helpers/todos_helper.rb @@ -100,17 +100,22 @@ module TodosHelper def todo_target_state_pill(todo) return unless show_todo_state?(todo) - type = - case todo.target - when MergeRequest - 'mr' - when Issue - 'issue' - when AlertManagement::Alert - 'alert' + state = todo.target.state.to_s + + case todo.target + when MergeRequest + if state == 'closed' + background_class = 'gl-bg-red-500' + elsif state == 'merged' + background_class = 'gl-bg-blue-500' end + when Issue + background_class = 'gl-bg-blue-500' if state == 'closed' + when AlertManagement::Alert + background_class = 'gl-bg-blue-500' if state == 'resolved' + end - tag.span class: "gl-my-0 gl-px-2 status-box status-box-#{type}-#{todo.target.state.to_s.dasherize}" do + tag.span class: "gl-my-0 gl-px-2 status-box #{background_class}" do todo.target.state.to_s.capitalize end end |