diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-12-21 12:44:34 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-12-21 12:44:34 +0000 |
| commit | 1548f7e02f455576ba17a51c78cdb4a66f3e5f68 (patch) | |
| tree | fb44c9d4c9fb1ccc8c53501a829ea54bad5f3f8d | |
| parent | ffcf1565089e36681cb0a75d5b51955b5b87ab78 (diff) | |
| parent | f93b876c6d0e580a9532b76855cba23f5fd5f3e7 (diff) | |
| download | gitlab-ce-1548f7e02f455576ba17a51c78cdb4a66f3e5f68.tar.gz | |
Merge branch '25898-ci-icon-color-mr' into 'master'
Adds CSS class to status icon on MR widget to prevent non-colored icon
Closes #25898
See merge request !8219
| -rw-r--r-- | app/views/projects/merge_requests/widget/_heading.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/25898-ci-icon-color-mr.yml | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/views/projects/merge_requests/widget/_heading.html.haml b/app/views/projects/merge_requests/widget/_heading.html.haml index 9ab7971b56c..5bc417d1760 100644 --- a/app/views/projects/merge_requests/widget/_heading.html.haml +++ b/app/views/projects/merge_requests/widget/_heading.html.haml @@ -17,7 +17,7 @@ - # TODO, remove in later versions when services like Jenkins will set CI status via Commit status API .mr-widget-heading - %w[success skipped canceled failed running pending].each do |status| - .ci_widget{class: "ci-#{status}", style: "display:none"} + .ci_widget{class: "ci-#{status} ci-status-icon-#{status}", style: "display:none"} = ci_icon_for_status(status) %span CI build diff --git a/changelogs/unreleased/25898-ci-icon-color-mr.yml b/changelogs/unreleased/25898-ci-icon-color-mr.yml new file mode 100644 index 00000000000..dd0f93e176f --- /dev/null +++ b/changelogs/unreleased/25898-ci-icon-color-mr.yml @@ -0,0 +1,4 @@ +--- +title: Adds CSS class to status icon on MR widget to prevent non-colored icon +merge_request: 8219 +author: |