From 1f1b3923ecb263d512a0340cd5b44cc249f3f698 Mon Sep 17 00:00:00 2001
From: Shinya Maeda <shinya@gitlab.com>
Date: Fri, 19 Oct 2018 16:28:41 +0000
Subject: Rename "scheduled" label/badge of delayed jobs to "delayed"

---
 lib/api/jobs.rb                            |  2 +-
 lib/gitlab/ci/status/build/scheduled.rb    |  4 ++--
 lib/gitlab/ci/status/pipeline/delayed.rb   | 21 +++++++++++++++++++++
 lib/gitlab/ci/status/pipeline/factory.rb   |  2 +-
 lib/gitlab/ci/status/pipeline/scheduled.rb | 21 ---------------------
 lib/gitlab/ci/status/scheduled.rb          |  4 ++--
 6 files changed, 27 insertions(+), 27 deletions(-)
 create mode 100644 lib/gitlab/ci/status/pipeline/delayed.rb
 delete mode 100644 lib/gitlab/ci/status/pipeline/scheduled.rb

(limited to 'lib')

diff --git a/lib/api/jobs.rb b/lib/api/jobs.rb
index fa992b9a440..697555c9605 100644
--- a/lib/api/jobs.rb
+++ b/lib/api/jobs.rb
@@ -151,7 +151,7 @@ module API
         present build, with: Entities::Job
       end
 
-      desc 'Trigger a actionable job (manual, scheduled, etc)' do
+      desc 'Trigger a actionable job (manual, delayed, etc)' do
         success Entities::Job
         detail 'This feature was added in GitLab 8.11'
       end
diff --git a/lib/gitlab/ci/status/build/scheduled.rb b/lib/gitlab/ci/status/build/scheduled.rb
index eebb3f761c5..6f460b62fa9 100644
--- a/lib/gitlab/ci/status/build/scheduled.rb
+++ b/lib/gitlab/ci/status/build/scheduled.rb
@@ -7,7 +7,7 @@ module Gitlab
             {
               image: 'illustrations/illustrations_scheduled-job_countdown.svg',
               size: 'svg-394',
-              title: _("This is a scheduled to run in ") + " #{execute_in}",
+              title: _("This is a delayed to run in ") + " #{execute_in}",
               content: _("This job will automatically run after it's timer finishes. " \
                          "Often they are used for incremental roll-out deploys " \
                          "to production environments. When unscheduled it converts " \
@@ -16,7 +16,7 @@ module Gitlab
           end
 
           def status_tooltip
-            "scheduled manual action (#{execute_in})"
+            "delayed manual action (#{execute_in})"
           end
 
           def self.matches?(build, user)
diff --git a/lib/gitlab/ci/status/pipeline/delayed.rb b/lib/gitlab/ci/status/pipeline/delayed.rb
new file mode 100644
index 00000000000..12736861c89
--- /dev/null
+++ b/lib/gitlab/ci/status/pipeline/delayed.rb
@@ -0,0 +1,21 @@
+module Gitlab
+  module Ci
+    module Status
+      module Pipeline
+        class Delayed < Status::Extended
+          def text
+            s_('CiStatusText|delayed')
+          end
+
+          def label
+            s_('CiStatusLabel|waiting for delayed job')
+          end
+
+          def self.matches?(pipeline, user)
+            pipeline.scheduled?
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/ci/status/pipeline/factory.rb b/lib/gitlab/ci/status/pipeline/factory.rb
index 00d8f01cbdc..0adf83fa197 100644
--- a/lib/gitlab/ci/status/pipeline/factory.rb
+++ b/lib/gitlab/ci/status/pipeline/factory.rb
@@ -5,7 +5,7 @@ module Gitlab
         class Factory < Status::Factory
           def self.extended_statuses
             [[Status::SuccessWarning,
-              Status::Pipeline::Scheduled,
+              Status::Pipeline::Delayed,
               Status::Pipeline::Blocked]]
           end
 
diff --git a/lib/gitlab/ci/status/pipeline/scheduled.rb b/lib/gitlab/ci/status/pipeline/scheduled.rb
deleted file mode 100644
index 9ec6994bd2f..00000000000
--- a/lib/gitlab/ci/status/pipeline/scheduled.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-module Gitlab
-  module Ci
-    module Status
-      module Pipeline
-        class Scheduled < Status::Extended
-          def text
-            s_('CiStatusText|scheduled')
-          end
-
-          def label
-            s_('CiStatusLabel|waiting for delayed job')
-          end
-
-          def self.matches?(pipeline, user)
-            pipeline.scheduled?
-          end
-        end
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/ci/status/scheduled.rb b/lib/gitlab/ci/status/scheduled.rb
index 542100e41da..3adcfa36af2 100644
--- a/lib/gitlab/ci/status/scheduled.rb
+++ b/lib/gitlab/ci/status/scheduled.rb
@@ -3,11 +3,11 @@ module Gitlab
     module Status
       class Scheduled < Status::Core
         def text
-          s_('CiStatusText|scheduled')
+          s_('CiStatusText|delayed')
         end
 
         def label
-          s_('CiStatusLabel|scheduled')
+          s_('CiStatusLabel|delayed')
         end
 
         def icon
-- 
cgit v1.2.1