diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2017-11-02 18:54:46 +0300 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2017-11-02 18:54:46 +0300 |
commit | 3852d404f3325d4145bed1bfb0b38c16426ad257 (patch) | |
tree | ec634671db3df4f819c863ff1346ce0ac8ba2929 /app/helpers | |
parent | 70c808d2963e814d6568884c7f133671c8f2bd57 (diff) | |
parent | 488346839b6fa4a708698a88973398848f7b9f26 (diff) |
Merge branch 'icons-ci-icons' into 'master'
Convert Icons in CI to SVG Sprite Icons
See merge request gitlab-org/gitlab-ce!14567
Diffstat (limited to 'app/helpers')
-rw-r--r-- | app/helpers/ci_status_helper.rb | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/app/helpers/ci_status_helper.rb b/app/helpers/ci_status_helper.rb index 8022547a6ad..4dd573c61f1 100644 --- a/app/helpers/ci_status_helper.rb +++ b/app/helpers/ci_status_helper.rb @@ -63,34 +63,34 @@ module CiStatusHelper def ci_icon_for_status(status) if detailed_status?(status) - return custom_icon(status.icon) + return sprite_icon(status.icon) end icon_name = case status when 'success' - 'icon_status_success' + 'status_success' when 'success_with_warnings' - 'icon_status_warning' + 'status_warning' when 'failed' - 'icon_status_failed' + 'status_failed' when 'pending' - 'icon_status_pending' + 'status_pending' when 'running' - 'icon_status_running' + 'status_running' when 'play' - 'icon_play' + 'play' when 'created' - 'icon_status_created' + 'status_created' when 'skipped' - 'icon_status_skipped' + 'status_skipped' when 'manual' - 'icon_status_manual' + 'status_manual' else - 'icon_status_canceled' + 'status_canceled' end - custom_icon(icon_name) + sprite_icon(icon_name, size: 16) end def pipeline_status_cache_key(pipeline_status) |