From 2dd7339c0149034aa5faa4029cff1a82aef35d21 Mon Sep 17 00:00:00 2001
From: Shinya Maeda <shinya@gitlab.com>
Date: Thu, 4 Oct 2018 17:52:36 +0900
Subject: [PATCH] Add scheduled actions in deployment entity

---
 app/models/ci/build.rb               | 6 +++++-
 app/models/deployment.rb             | 6 +++++-
 app/serializers/deployment_entity.rb | 1 +
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index 8f1547463ba..9b0bb2e05fc 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 6962b54441b..ed61135cb47 100644
--- a/app/models/deployment.rb
+++ b/app/models/deployment.rb
@@ -44,7 +44,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)
diff --git a/app/serializers/deployment_entity.rb b/app/serializers/deployment_entity.rb
index 344148a1fb7..aa1d9e6292c 100644
--- a/app/serializers/deployment_entity.rb
+++ b/app/serializers/deployment_entity.rb
@@ -25,4 +25,5 @@ class DeploymentEntity < Grape::Entity
   expose :commit, using: CommitEntity
   expose :deployable, using: JobEntity
   expose :manual_actions, using: JobEntity
+  expose :scheduled_actions, using: JobEntity
 end