Commit 1f1b3923 authored by Shinya Maeda's avatar Shinya Maeda Committed by Kamil Trzciński

Rename "scheduled" label/badge of delayed jobs to "delayed"

parent 041e0316
...@@ -42,7 +42,7 @@ module CiStatusHelper ...@@ -42,7 +42,7 @@ module CiStatusHelper
when 'manual' when 'manual'
s_('CiStatusText|blocked') s_('CiStatusText|blocked')
when 'scheduled' when 'scheduled'
s_('CiStatusText|scheduled') s_('CiStatusText|delayed')
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
......
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
- if job.try(:allow_failure) - if job.try(:allow_failure)
%span.badge.badge-danger allowed to fail %span.badge.badge-danger allowed to fail
- if job.schedulable? - if job.schedulable?
%span.badge.badge-info= s_('DelayedJobs|scheduled') %span.badge.badge-info= s_('DelayedJobs|delayed')
- elsif job.action? - elsif job.action?
%span.badge.badge-info manual %span.badge.badge-info manual
......
---
title: Rename "scheduled" label/badge of delayed jobs to "delayed"
merge_request: 22245
author:
type: changed
...@@ -151,7 +151,7 @@ module API ...@@ -151,7 +151,7 @@ module API
present build, with: Entities::Job present build, with: Entities::Job
end end
desc 'Trigger a actionable job (manual, scheduled, etc)' do desc 'Trigger a actionable job (manual, delayed, etc)' do
success Entities::Job success Entities::Job
detail 'This feature was added in GitLab 8.11' detail 'This feature was added in GitLab 8.11'
end end
......
...@@ -7,7 +7,7 @@ module Gitlab ...@@ -7,7 +7,7 @@ module Gitlab
{ {
image: 'illustrations/illustrations_scheduled-job_countdown.svg', image: 'illustrations/illustrations_scheduled-job_countdown.svg',
size: 'svg-394', 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. " \ content: _("This job will automatically run after it's timer finishes. " \
"Often they are used for incremental roll-out deploys " \ "Often they are used for incremental roll-out deploys " \
"to production environments. When unscheduled it converts " \ "to production environments. When unscheduled it converts " \
...@@ -16,7 +16,7 @@ module Gitlab ...@@ -16,7 +16,7 @@ module Gitlab
end end
def status_tooltip def status_tooltip
"scheduled manual action (#{execute_in})" "delayed manual action (#{execute_in})"
end end
def self.matches?(build, user) def self.matches?(build, user)
......
...@@ -2,9 +2,9 @@ module Gitlab ...@@ -2,9 +2,9 @@ module Gitlab
module Ci module Ci
module Status module Status
module Pipeline module Pipeline
class Scheduled < Status::Extended class Delayed < Status::Extended
def text def text
s_('CiStatusText|scheduled') s_('CiStatusText|delayed')
end end
def label def label
......
...@@ -5,7 +5,7 @@ module Gitlab ...@@ -5,7 +5,7 @@ module Gitlab
class Factory < Status::Factory class Factory < Status::Factory
def self.extended_statuses def self.extended_statuses
[[Status::SuccessWarning, [[Status::SuccessWarning,
Status::Pipeline::Scheduled, Status::Pipeline::Delayed,
Status::Pipeline::Blocked]] Status::Pipeline::Blocked]]
end end
......
...@@ -3,11 +3,11 @@ module Gitlab ...@@ -3,11 +3,11 @@ module Gitlab
module Status module Status
class Scheduled < Status::Core class Scheduled < Status::Core
def text def text
s_('CiStatusText|scheduled') s_('CiStatusText|delayed')
end end
def label def label
s_('CiStatusLabel|scheduled') s_('CiStatusLabel|delayed')
end end
def icon def icon
......
...@@ -1217,6 +1217,9 @@ msgstr "" ...@@ -1217,6 +1217,9 @@ msgstr ""
msgid "CiStatusLabel|created" msgid "CiStatusLabel|created"
msgstr "" msgstr ""
msgid "CiStatusLabel|delayed"
msgstr ""
msgid "CiStatusLabel|failed" msgid "CiStatusLabel|failed"
msgstr "" msgstr ""
...@@ -1232,9 +1235,6 @@ msgstr "" ...@@ -1232,9 +1235,6 @@ msgstr ""
msgid "CiStatusLabel|pending" msgid "CiStatusLabel|pending"
msgstr "" msgstr ""
msgid "CiStatusLabel|scheduled"
msgstr ""
msgid "CiStatusLabel|skipped" msgid "CiStatusLabel|skipped"
msgstr "" msgstr ""
...@@ -1253,6 +1253,9 @@ msgstr "" ...@@ -1253,6 +1253,9 @@ msgstr ""
msgid "CiStatusText|created" msgid "CiStatusText|created"
msgstr "" msgstr ""
msgid "CiStatusText|delayed"
msgstr ""
msgid "CiStatusText|failed" msgid "CiStatusText|failed"
msgstr "" msgstr ""
...@@ -1265,9 +1268,6 @@ msgstr "" ...@@ -1265,9 +1268,6 @@ msgstr ""
msgid "CiStatusText|pending" msgid "CiStatusText|pending"
msgstr "" msgstr ""
msgid "CiStatusText|scheduled"
msgstr ""
msgid "CiStatusText|skipped" msgid "CiStatusText|skipped"
msgstr "" msgstr ""
...@@ -2178,7 +2178,7 @@ msgstr "" ...@@ -2178,7 +2178,7 @@ msgstr ""
msgid "DelayedJobs|Unschedule" msgid "DelayedJobs|Unschedule"
msgstr "" msgstr ""
msgid "DelayedJobs|scheduled" msgid "DelayedJobs|delayed"
msgstr "" msgstr ""
msgid "Delete" msgid "Delete"
...@@ -6113,7 +6113,7 @@ msgstr "" ...@@ -6113,7 +6113,7 @@ msgstr ""
msgid "This is a confidential issue." msgid "This is a confidential issue."
msgstr "" msgstr ""
msgid "This is a scheduled to run in " msgid "This is a delayed to run in "
msgstr "" msgstr ""
msgid "This is the author's first Merge Request to this project." msgid "This is the author's first Merge Request to this project."
......
...@@ -594,7 +594,7 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do ...@@ -594,7 +594,7 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do
end end
it 'shows delayed job', :js do it 'shows delayed job', :js do
expect(page).to have_content('This is a scheduled to run in') expect(page).to have_content('This is a delayed to run in')
expect(page).to have_content("This job will automatically run after it's timer finishes.") expect(page).to have_content("This job will automatically run after it's timer finishes.")
expect(page).to have_link('Unschedule job') expect(page).to have_link('Unschedule job')
end end
......
...@@ -339,7 +339,7 @@ describe Gitlab::Ci::Status::Build::Factory do ...@@ -339,7 +339,7 @@ describe Gitlab::Ci::Status::Build::Factory do
end end
it 'fabricates status with correct details' do it 'fabricates status with correct details' do
expect(status.text).to eq 'scheduled' expect(status.text).to eq 'delayed'
expect(status.group).to eq 'scheduled' expect(status.group).to eq 'scheduled'
expect(status.icon).to eq 'status_scheduled' expect(status.icon).to eq 'status_scheduled'
expect(status.favicon).to eq 'favicon_status_scheduled' expect(status.favicon).to eq 'favicon_status_scheduled'
......
require 'spec_helper' require 'spec_helper'
describe Gitlab::Ci::Status::Pipeline::Scheduled do describe Gitlab::Ci::Status::Pipeline::Delayed do
let(:pipeline) { double('pipeline') } let(:pipeline) { double('pipeline') }
subject do subject do
...@@ -9,7 +9,7 @@ describe Gitlab::Ci::Status::Pipeline::Scheduled do ...@@ -9,7 +9,7 @@ describe Gitlab::Ci::Status::Pipeline::Scheduled do
describe '#text' do describe '#text' do
it 'overrides status text' do it 'overrides status text' do
expect(subject.text).to eq 'scheduled' expect(subject.text).to eq 'delayed'
end end
end end
......
...@@ -71,7 +71,7 @@ describe Gitlab::Ci::Status::Pipeline::Factory do ...@@ -71,7 +71,7 @@ describe Gitlab::Ci::Status::Pipeline::Factory do
it 'matches a correct extended statuses' do it 'matches a correct extended statuses' do
expect(factory.extended_statuses) expect(factory.extended_statuses)
.to eq [Gitlab::Ci::Status::Pipeline::Scheduled] .to eq [Gitlab::Ci::Status::Pipeline::Delayed]
end end
it 'extends core status with common pipeline methods' do it 'extends core status with common pipeline methods' do
......
...@@ -6,11 +6,11 @@ describe Gitlab::Ci::Status::Scheduled do ...@@ -6,11 +6,11 @@ describe Gitlab::Ci::Status::Scheduled do
end end
describe '#text' do describe '#text' do
it { expect(subject.text).to eq 'scheduled' } it { expect(subject.text).to eq 'delayed' }
end end
describe '#label' do describe '#label' do
it { expect(subject.label).to eq 'scheduled' } it { expect(subject.label).to eq 'delayed' }
end end
describe '#icon' do describe '#icon' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment