diff options
| author | Shinya Maeda <gitlab.shinyamaeda@gmail.com> | 2017-03-30 14:59:20 +0300 |
|---|---|---|
| committer | Shinya Maeda <gitlab.shinyamaeda@gmail.com> | 2017-04-06 17:46:58 +0300 |
| commit | 13bac4c252d2e84484bd0038a6c463e8b0a9cced (patch) | |
| tree | 0cda7b4a2f253222d222c53a57b27c5d5b5d3e61 | |
| parent | da8db28d17c91d5e751aaa9dbd9d756d2be9b5db (diff) | |
Use delegate for ref on ci_trigger
| -rw-r--r-- | app/models/ci/trigger_schedule.rb | 2 | ||||
| -rw-r--r-- | 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 |