diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2019-06-04 08:22:14 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2019-06-04 08:22:14 +0000 |
| commit | 554fbb2a49936a8038ee2e26231b69922009023a (patch) | |
| tree | b27f26e64b5947364a027e3c87aabd1acb345c22 /spec/features | |
| parent | d16c11ab36d91fc51a01406fa77ee2bf307ad8f5 (diff) | |
| parent | 6a18a411a30e9e7406ba9335ab502ec396add662 (diff) | |
| download | gitlab-ce-554fbb2a49936a8038ee2e26231b69922009023a.tar.gz | |
Merge branch 'set-real-next-run-at-for-preventing-duplciate-pipeline-creations' into 'master'
Make pipeline schedule worker resilient
Closes gitlab-com/gl-infra/production#805 and #61955
See merge request gitlab-org/gitlab-ce!28407
Diffstat (limited to 'spec/features')
| -rw-r--r-- | spec/features/projects/pipeline_schedules_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/features/projects/pipeline_schedules_spec.rb b/spec/features/projects/pipeline_schedules_spec.rb index b1a705f09ce..24041a51383 100644 --- a/spec/features/projects/pipeline_schedules_spec.rb +++ b/spec/features/projects/pipeline_schedules_spec.rb @@ -225,7 +225,7 @@ describe 'Pipeline Schedules', :js do context 'when active is true and next_run_at is NULL' do before do create(:ci_pipeline_schedule, project: project, owner: user).tap do |pipeline_schedule| - pipeline_schedule.update_attribute(:cron, nil) # Consequently next_run_at will be nil + pipeline_schedule.update_attribute(:next_run_at, nil) # Consequently next_run_at will be nil end end |