kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fix scheduled icon for stages

This commit is contained in:
Shinya Maeda 2018-10-01 19:00:34 +09:00 committed by Alessio Caiazza
parent 533f5ca4c9
commit eb238ec160
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/stylesheets/framework/icons.scss
View File

@ -64,6 +64,7 @@
} }
} }
.ci-status-icon-scheduled,
.ci-status-icon-manual { .ci-status-icon-manual {
svg { svg {
fill: $gl-text-color; fill: $gl-text-color;

7
app/helpers/ci_status_helper.rb
View File

@ -7,7 +7,6 @@
# #
# See 'detailed_status?` method and `Gitlab::Ci::Status` module. # See 'detailed_status?` method and `Gitlab::Ci::Status` module.
# #
# TODO: DO I need to update this deprecated module?
module CiStatusHelper module CiStatusHelper
def ci_label_for_status(status) def ci_label_for_status(status)
if detailed_status?(status) if detailed_status?(status)
@ -21,6 +20,8 @@ module CiStatusHelper
'passed with warnings' 'passed with warnings'
when 'manual' when 'manual'
'waiting for manual action' 'waiting for manual action'
when 'scheduled'
'waiting for delayed job'
else else
status status
end end
@ -40,6 +41,8 @@ module CiStatusHelper
s_('CiStatusText|passed') s_('CiStatusText|passed')
when 'manual' when 'manual'
s_('CiStatusText|blocked') s_('CiStatusText|blocked')
when 'scheduled'
s_('CiStatusText|scheduled')
else else
# All states are already being translated inside the detailed statuses: # All states are already being translated inside the detailed statuses:
# :running => Gitlab::Ci::Status::Running # :running => Gitlab::Ci::Status::Running
@ -84,6 +87,8 @@ module CiStatusHelper
'status_skipped' 'status_skipped'
when 'manual' when 'manual'
'status_manual' 'status_manual'
when 'scheduled'
'status_scheduled'
else else
'status_canceled' 'status_canceled'
end end