diff options
author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-07-20 10:31:23 +0200 |
---|---|---|
committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-07-20 10:31:23 +0200 |
commit | 2016f367f0e6f718e8e938bd85cd81d7a99d6c10 (patch) | |
tree | 9fd352f5a7591d4fb35056000087ebcd36ad0469 /app/helpers/ci_status_helper.rb | |
parent | 737e5226f87b06c2fe8633819bce1fde16308f19 (diff) | |
parent | 79b02e40e5842540ceff4454f6c2c51f13fc081c (diff) | |
download | gitlab-ce-2016f367f0e6f718e8e938bd85cd81d7a99d6c10.tar.gz |
Merge remote-tracking branch 'origin/master' into cs-warn-on-failurecs-warn-on-failure
Diffstat (limited to 'app/helpers/ci_status_helper.rb')
-rw-r--r-- | app/helpers/ci_status_helper.rb | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/app/helpers/ci_status_helper.rb b/app/helpers/ci_status_helper.rb index 44b8b7f6ca1..ffac28f78a0 100644 --- a/app/helpers/ci_status_helper.rb +++ b/app/helpers/ci_status_helper.rb @@ -29,20 +29,20 @@ module CiStatusHelper icon_name = case status when 'success' - 'check' + 'icon_status_success' when 'success_with_warnings' - 'exclamation-triangle' + 'icon_status_warning' when 'failed' - 'close' + 'icon_status_failed' when 'pending' - 'clock-o' + 'icon_status_pending' when 'running' - 'spinner' + 'icon_status_running' else - 'circle' + 'icon_status_cancel' end - icon(icon_name + ' fw') + custom_icon(icon_name) end def render_commit_status(commit, tooltip_placement: 'auto left', cssclass: '') |