diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2017-04-07 22:31:07 +0300 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-04-07 22:31:07 +0300 |
commit | 3ded903d7b0c477d63916ed6f0258392e4cb001a (patch) | |
tree | 334cdd8010cb5e1fae56105e938fca702d90479b /spec/factories | |
parent | 5d4449151fb576dc927ff1d0ff343fca4645159b (diff) | |
parent | 682748e8abbc05d3059c2f945cda9d18081947f5 (diff) |
Merge branch 'dosuken123/gitlab-ce-2989-run-cicd-pipelines-on-a-schedule-idea1-basic-backend-implementation-with-quick-ui' into 'master'
Add "engineering" UI for Pipeline Schedule
See merge request !10533
Diffstat (limited to 'spec/factories')
-rw-r--r-- | spec/factories/ci/trigger_schedules.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/spec/factories/ci/trigger_schedules.rb b/spec/factories/ci/trigger_schedules.rb index 315bce16995..2390706fa41 100644 --- a/spec/factories/ci/trigger_schedules.rb +++ b/spec/factories/ci/trigger_schedules.rb @@ -3,9 +3,11 @@ FactoryGirl.define do trigger factory: :ci_trigger_for_trigger_schedule cron '0 1 * * *' cron_timezone Gitlab::Ci::CronParser::VALID_SYNTAX_SAMPLE_TIME_ZONE + ref 'master' + active true after(:build) do |trigger_schedule, evaluator| - trigger_schedule.update!(project: trigger_schedule.trigger.project) + trigger_schedule.project ||= trigger_schedule.trigger.project end trait :nightly do |