diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-24 12:08:01 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-24 12:08:01 +0000 |
| commit | c6373a2cec855c6543a1e035c52099e102dd05ef (patch) | |
| tree | 507c4d975e1bf559a008d997ad4b07dad14f397e /app/helpers | |
| parent | 6593f1f627938f22090dec5221476772d3ed581d (diff) | |
| download | gitlab-ce-c6373a2cec855c6543a1e035c52099e102dd05ef.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/ci_status_helper.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/helpers/ci_status_helper.rb b/app/helpers/ci_status_helper.rb index 4471d5b64b2..80d1b7e7edb 100644 --- a/app/helpers/ci_status_helper.rb +++ b/app/helpers/ci_status_helper.rb @@ -62,6 +62,7 @@ module CiStatusHelper status.humanize end + # rubocop:disable Metrics/CyclomaticComplexity def ci_icon_for_status(status, size: 16) if detailed_status?(status) return sprite_icon(status.icon, size: size) @@ -77,6 +78,8 @@ module CiStatusHelper 'status_failed' when 'pending' 'status_pending' + when 'waiting_for_resource' + 'status_pending' when 'preparing' 'status_preparing' when 'running' @@ -97,6 +100,7 @@ module CiStatusHelper sprite_icon(icon_name, size: size) end + # rubocop:enable Metrics/CyclomaticComplexity def ci_icon_class_for_status(status) group = detailed_status?(status) ? status.group : status.dasherize |