summaryrefslogtreecommitdiff
path: root/app/workers
diff options
context:
space:
mode:
authorShinya Maeda <shinya@gitlab.com>2017-11-16 02:55:41 +0900
committerShinya Maeda <shinya@gitlab.com>2017-11-23 02:53:34 +0900
commit65cadff1907183212856cf60f6ae4a6191cee153 (patch)
treeb6a25d46593677bc7a47d4a57731aa2fb6cc72eb /app/workers
parent6369db0196ec7b6e288b16382c95243424a59b62 (diff)
downloadgitlab-ce-65cadff1907183212856cf60f6ae4a6191cee153.tar.gz
Avoid deactivation when pipeline schedules execute a commit includes `[ci skip]`
Diffstat (limited to 'app/workers')
-rw-r--r--app/workers/pipeline_schedule_worker.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/workers/pipeline_schedule_worker.rb b/app/workers/pipeline_schedule_worker.rb
index d7087f20dfc..7320db1065e 100644
--- a/app/workers/pipeline_schedule_worker.rb
+++ b/app/workers/pipeline_schedule_worker.rb
@@ -9,7 +9,7 @@ class PipelineScheduleWorker
pipeline = Ci::CreatePipelineService.new(schedule.project,
schedule.owner,
ref: schedule.ref)
- .execute(:schedule, save_on_errors: false, schedule: schedule)
+ .execute(:schedule, ignore_skip_ci: true, save_on_errors: false, schedule: schedule)
schedule.deactivate! unless pipeline.persisted?
rescue => e