summaryrefslogtreecommitdiff
path: root/app/helpers
diff options
context:
space:
mode:
authorShinya Maeda <shinya@gitlab.com>2018-10-01 19:00:34 +0900
committerAlessio Caiazza <acaiazza@gitlab.com>2018-10-02 17:08:14 +0200
commiteb238ec16004d9d22c20193eb8a8ee6cf0df4c8b (patch)
tree29a2d29cb0e21645698bde242fe4c40ec150dc79 /app/helpers
parent533f5ca4c9f899910f9cdc4f0e0b43d619a9c7df (diff)
downloadgitlab-ce-eb238ec16004d9d22c20193eb8a8ee6cf0df4c8b.tar.gz
Fix scheduled icon for stages
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/ci_status_helper.rb7
1 files changed, 6 insertions, 1 deletions
diff --git a/app/helpers/ci_status_helper.rb b/app/helpers/ci_status_helper.rb
index f343607a343..6f9e2ef78cd 100644
--- a/app/helpers/ci_status_helper.rb
+++ b/app/helpers/ci_status_helper.rb
@@ -7,7 +7,6 @@
#
# See 'detailed_status?` method and `Gitlab::Ci::Status` module.
#
-# TODO: DO I need to update this deprecated module?
module CiStatusHelper
def ci_label_for_status(status)
if detailed_status?(status)
@@ -21,6 +20,8 @@ module CiStatusHelper
'passed with warnings'
when 'manual'
'waiting for manual action'
+ when 'scheduled'
+ 'waiting for delayed job'
else
status
end
@@ -40,6 +41,8 @@ module CiStatusHelper
s_('CiStatusText|passed')
when 'manual'
s_('CiStatusText|blocked')
+ when 'scheduled'
+ s_('CiStatusText|scheduled')
else
# All states are already being translated inside the detailed statuses:
# :running => Gitlab::Ci::Status::Running
@@ -84,6 +87,8 @@ module CiStatusHelper
'status_skipped'
when 'manual'
'status_manual'
+ when 'scheduled'
+ 'status_scheduled'
else
'status_canceled'
end