From 13bac4c252d2e84484bd0038a6c463e8b0a9cced Mon Sep 17 00:00:00 2001
From: Shinya Maeda <gitlab.shinyamaeda@gmail.com>
Date: Thu, 30 Mar 2017 20:59:20 +0900
Subject: [PATCH] Use delegate for ref on ci_trigger

---
 app/models/ci/trigger_schedule.rb      | 2 ++
 app/workers/trigger_schedule_worker.rb | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/models/ci/trigger_schedule.rb b/app/models/ci/trigger_schedule.rb
index 1b3b73971bb..b9a99d86500 100644
--- a/app/models/ci/trigger_schedule.rb
+++ b/app/models/ci/trigger_schedule.rb
@@ -7,6 +7,8 @@ module Ci
     belongs_to :project
     belongs_to :trigger
 
+    delegate :ref, to: :trigger
+
     validates :trigger, presence: true
     validates :cron, presence: true
     validates :cron_time_zone, presence: true
diff --git a/app/workers/trigger_schedule_worker.rb b/app/workers/trigger_schedule_worker.rb
index 04a53a38adb..440c579b99d 100644
--- a/app/workers/trigger_schedule_worker.rb
+++ b/app/workers/trigger_schedule_worker.rb
@@ -5,9 +5,9 @@ class TriggerScheduleWorker
   def perform
     Ci::TriggerSchedule.where("next_run_at < ?", Time.now).find_each do |trigger_schedule|
       begin
-        Ci::CreateTriggerRequestService.new.execute(trigger_schedule.trigger.project,
+        Ci::CreateTriggerRequestService.new.execute(trigger_schedule.project,
                                                     trigger_schedule.trigger,
-                                                    trigger_schedule.trigger.ref)
+                                                    trigger_schedule.ref)
       rescue => e
         Rails.logger.error "#{trigger_schedule.id}: Failed to trigger_schedule job: #{e.message}"
       ensure