summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorShinya Maeda <shinya@gitlab.com>2018-10-19 16:28:41 +0000
committerKamil TrzciƄski <ayufan@ayufan.eu>2018-10-19 16:28:41 +0000
commit1f1b3923ecb263d512a0340cd5b44cc249f3f698 (patch)
treec2b024ac7ed800d32aed9264593c11965e52b4f5 /lib
parent041e03169f072fa8e403d705314c0e739ebac6f9 (diff)
downloadgitlab-ce-1f1b3923ecb263d512a0340cd5b44cc249f3f698.tar.gz
Rename "scheduled" label/badge of delayed jobs to "delayed"
Diffstat (limited to 'lib')
-rw-r--r--lib/api/jobs.rb2
-rw-r--r--lib/gitlab/ci/status/build/scheduled.rb4
-rw-r--r--lib/gitlab/ci/status/pipeline/delayed.rb (renamed from lib/gitlab/ci/status/pipeline/scheduled.rb)4
-rw-r--r--lib/gitlab/ci/status/pipeline/factory.rb2
-rw-r--r--lib/gitlab/ci/status/scheduled.rb4
5 files changed, 8 insertions, 8 deletions
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/scheduled.rb b/lib/gitlab/ci/status/pipeline/delayed.rb
index 9ec6994bd2f..12736861c89 100644
--- a/lib/gitlab/ci/status/pipeline/scheduled.rb
+++ b/lib/gitlab/ci/status/pipeline/delayed.rb
@@ -2,9 +2,9 @@ module Gitlab
module Ci
module Status
module Pipeline
- class Scheduled < Status::Extended
+ class Delayed < Status::Extended
def text
- s_('CiStatusText|scheduled')
+ s_('CiStatusText|delayed')
end
def label
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/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