Merge branch 'winh-delayed-jobs-dynamic-timer' into 'master'

Add dynamic timer to delayed jobs

See merge request gitlab-org/gitlab-ce!22382

1 files changed, 2 insertions, 11 deletions

diff --git a/lib/gitlab/ci/status/build/scheduled.rb b/lib/gitlab/ci/status/build/scheduled.rb
index f443dbee120..b3452eae189 100644
--- a/lib/gitlab/ci/status/build/scheduled.rb
+++ b/lib/gitlab/ci/status/build/scheduled.rb
@@ -9,7 +9,7 @@ module Gitlab
             {
               image: 'illustrations/illustrations_scheduled-job_countdown.svg',
               size: 'svg-394',
-              title: _("This is a delayed to run in ") + " #{execute_in}",
+              title: _("This is a delayed job to run in %{remainingTime}"),
               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 " \
@@ -18,21 +18,12 @@ module Gitlab
           end
 
           def status_tooltip
-            "delayed manual action (#{execute_in})"
+            "delayed manual action (%{remainingTime})"
           end
 
           def self.matches?(build, user)
             build.scheduled? && build.scheduled_at
           end
-
-          private
-
-          include TimeHelper
-
-          def execute_in
-            remaining_seconds = [0, subject.scheduled_at - Time.now].max
-            duration_in_numbers(remaining_seconds)
-          end
         end
       end
     end