Add a new status to ci_builds.status

3 files changed, 10 insertions, 6 deletions

diff --git a/lib/api/jobs.rb b/lib/api/jobs.rb
index 63fab6b0abb..fa992b9a440 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 manual job' do
+      desc 'Trigger a actionable job (manual, scheduled, etc)' do
         success Entities::Job
         detail 'This feature was added in GitLab 8.11'
       end
diff --git a/lib/gitlab/ci/config/entry/job.rb b/lib/gitlab/ci/config/entry/job.rb
index 02589d147ef..3ad048883af 100644
--- a/lib/gitlab/ci/config/entry/job.rb
+++ b/lib/gitlab/ci/config/entry/job.rb
@@ -35,11 +35,11 @@ module Gitlab
               validates :dependencies, array_of_strings: true
               validates :extends, type: String
 
-              with_options if: :manual_action? do
-                validates :start_in, duration: true, allow_nil: true
+              with_options if: :delayed? do
+                validates :start_in, duration: true, allow_nil: false
               end
 
-              with_options unless: :manual_action? do
+              with_options unless: :delayed? do
                 validates :start_in, presence: false
               end
             end
@@ -119,7 +119,11 @@ module Gitlab
           end
 
           def manual_action?
-            %w[manual delayed].include?(self.when)
+            self.when == 'manual'
+          end
+
+          def delayed?
+            self.when == 'delayed'
           end
 
           def ignored?
diff --git a/lib/gitlab/ci/status/build/scheduled.rb b/lib/gitlab/ci/status/build/scheduled.rb
index 93da8fb9538..010d5e2142f 100644
--- a/lib/gitlab/ci/status/build/scheduled.rb
+++ b/lib/gitlab/ci/status/build/scheduled.rb
@@ -39,7 +39,7 @@ module Gitlab
           end
 
           def self.matches?(build, user)
-            build.schedulable? && !build.canceled?
+            build.scheduled?
           end
 
           private