Merge branch 'scheduled-manual-jobs-environment-play-buttons' into 'master'

Add the Play button for delayed jobs in environment page

Closes #52129

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

2 files changed, 10 insertions, 2 deletions

diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index bb5d52fc78d..600c562d05a 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -245,10 +245,14 @@ module Ci
         .fabricate!
     end
 
-    def other_actions
+    def other_manual_actions
       pipeline.manual_actions.where.not(name: name)
     end
 
+    def other_scheduled_actions
+      pipeline.scheduled_actions.where.not(name: name)
+    end
+
     def pages_generator?
       Gitlab.config.pages.enabled &&
         self.name == 'pages'
diff --git a/app/models/deployment.rb b/app/models/deployment.rb
index ee5b96e7454..37efbb04fce 100644
--- a/app/models/deployment.rb
+++ b/app/models/deployment.rb
@@ -55,7 +55,11 @@ class Deployment < ActiveRecord::Base
   end
 
   def manual_actions
-    @manual_actions ||= deployable.try(:other_actions)
+    @manual_actions ||= deployable.try(:other_manual_actions)
+  end
+
+  def scheduled_actions
+    @scheduled_actions ||= deployable.try(:other_scheduled_actions)
   end
 
   def includes_commit?(commit)