summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorShinya Maeda <gitlab.shinyamaeda@gmail.com>2017-04-07 19:17:41 +0900
committerKamil Trzcinski <ayufan@ayufan.eu>2017-04-07 16:17:28 +0200
commit4131ed2bd85d3efdfe0e27d47ffc95567dae11af (patch)
tree6b843a11bee4f124d890911d6e2d1e56e383ef8a /app
parentea8574fd3777ecf8eabf9483b14ee530337faf28 (diff)
downloadgitlab-ce-4131ed2bd85d3efdfe0e27d47ffc95567dae11af.tar.gz
before_create :set_project. Now TriggerSchedule saves project from parent
Diffstat (limited to 'app')
-rw-r--r--app/models/ci/trigger_schedule.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/app/models/ci/trigger_schedule.rb b/app/models/ci/trigger_schedule.rb
index f7d602920ba..bb58c510277 100644
--- a/app/models/ci/trigger_schedule.rb
+++ b/app/models/ci/trigger_schedule.rb
@@ -15,11 +15,15 @@ module Ci
validates :cron_timezone, cron_timezone: true, presence: { unless: :importing? }
validates :ref, presence: { unless: :importing? }
+ before_create :set_project
before_save :set_next_run_at
+ def set_project
+ self.project = trigger.project
+ end
+
def set_next_run_at
self.next_run_at = Gitlab::Ci::CronParser.new(cron, cron_timezone).next_time_from(Time.now)
- self.project = trigger.project
end
def schedule_next_run!