diff options
author | Shinya Maeda <shinya@gitlab.com> | 2018-09-17 12:26:22 +0300 |
---|---|---|
committer | Alessio Caiazza <acaiazza@gitlab.com> | 2018-10-02 17:57:37 +0300 |
commit | 3fc4c096a592fbc0af3a8d60d2026ed673126a2f (patch) | |
tree | c886cf4b6a4b07c47576db4fb28e3c87f2907dae /lib/gitlab/ci/status/build | |
parent | d5184e0d8b48bc221e1ea401b9171db07959b50c (diff) |
Squashed commit of the following:
commit 9d9594ba20097dc4598f7eb42a9f9d78d73eae54
Author: Shinya Maeda <shinya@gitlab.com>
Date: Thu Sep 13 20:18:31 2018 +0900
Cancel scheduled jobs
commit f31c7172e07a9eb03b58c1e62eaa18cda4064aa6
Author: Shinya Maeda <shinya@gitlab.com>
Date: Thu Sep 13 11:18:42 2018 +0900
Add Ci::BuildSchedule
commit fb6b3ca638f40f9e1ee38b1fdd892bda4f6fede7
Author: Shinya Maeda <shinya@gitlab.com>
Date: Wed Sep 12 20:02:50 2018 +0900
Scheduled jobs
Diffstat (limited to 'lib/gitlab/ci/status/build')
-rw-r--r-- | lib/gitlab/ci/status/build/factory.rb | 1 | ||||
-rw-r--r-- | lib/gitlab/ci/status/build/manual_with_auto_play.rb | 52 |
2 files changed, 53 insertions, 0 deletions
diff --git a/lib/gitlab/ci/status/build/factory.rb b/lib/gitlab/ci/status/build/factory.rb index 2b26ebb45a1..e1b40472fc5 100644 --- a/lib/gitlab/ci/status/build/factory.rb +++ b/lib/gitlab/ci/status/build/factory.rb @@ -5,6 +5,7 @@ module Gitlab class Factory < Status::Factory def self.extended_statuses [[Status::Build::Erased, + Status::Build::ManualWithAutoPlay, Status::Build::Manual, Status::Build::Canceled, Status::Build::Created, diff --git a/lib/gitlab/ci/status/build/manual_with_auto_play.rb b/lib/gitlab/ci/status/build/manual_with_auto_play.rb new file mode 100644 index 00000000000..f34f0be5d45 --- /dev/null +++ b/lib/gitlab/ci/status/build/manual_with_auto_play.rb @@ -0,0 +1,52 @@ +module Gitlab + module Ci + module Status + module Build + class ManualWithAutoPlay < Status::Extended + ### + # TODO: Those are random values. We have to fix accoding to the UX review + ### + + ### + # Core override + ### + def text + s_('CiStatusText|scheduled') + end + + def label + s_('CiStatusLabel|scheduled') + end + + def icon + 'timer' + end + + def favicon + 'favicon_status_manual_with_auto_play' + end + + ### + # Extension override + ### + def illustration + { + image: 'illustrations/canceled-job_empty.svg', + size: 'svg-394', + title: _('This job is a scheduled job with manual actions!'), + content: _('auto playyyyyyyyyyyyyy! This job depends on a user to trigger its process. Often they are used to deploy code to production environments') + } + end + + def status_tooltip + @status.status_tooltip + " (scheulded) : Execute in #{subject.build_schedule.execute_in.round} sec" + end + + def self.matches?(build, user) + build.autoplay? && !build.canceled? + end + end + end + end + end +end |