Rename delayed to scheduled

2 files changed, 13 insertions, 11 deletions

diff --git a/lib/gitlab/ci/status/build/factory.rb b/lib/gitlab/ci/status/build/factory.rb
index 0fbab6e7673..3f762c42747 100644
--- a/lib/gitlab/ci/status/build/factory.rb
+++ b/lib/gitlab/ci/status/build/factory.rb
@@ -5,7 +5,7 @@ module Gitlab
         class Factory < Status::Factory
           def self.extended_statuses
             [[Status::Build::Erased,
-              Status::Build::Delayed,
+              Status::Build::Scheduled,
               Status::Build::Manual,
               Status::Build::Canceled,
               Status::Build::Created,
diff --git a/lib/gitlab/ci/status/build/delayed.rb b/lib/gitlab/ci/status/build/scheduled.rb
index 553d4cf8a71..93da8fb9538 100644
--- a/lib/gitlab/ci/status/build/delayed.rb
+++ b/lib/gitlab/ci/status/build/scheduled.rb
@@ -2,11 +2,7 @@ module Gitlab
   module Ci
     module Status
       module Build
-        class Delayed < Status::Extended
-          ###
-          # TODO: Those are random values. We have to fix accoding to the UX review
-          ###
-
+        class Scheduled < Status::Extended
           ###
           # Core override
           ###
@@ -23,7 +19,7 @@ module Gitlab
           end
 
           def favicon
-            'favicon_status_manual_with_auto_play'
+            'favicon_status_scheduled'
           end
 
           ###
@@ -33,17 +29,23 @@ module Gitlab
             {
               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')
+              title: _("This is a scheduled 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 into a manual action.")
             }
           end
 
           def status_tooltip
-            @status.status_tooltip + " (scheulded) : Execute in #{subject.build_schedule.execute_in.round} sec"
+            "scheduled manual action (#{execute_in})"
           end
 
           def self.matches?(build, user)
-            build.delayed? && !build.canceled?
+            build.schedulable? && !build.canceled?
+          end
+
+          private
+
+          def execute_in
+            Time.at(subject.build_schedule.execute_in).utc.strftime("%H:%M:%S")
           end
         end
       end