summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShinya Maeda <shinya@gitlab.com>2017-11-16 02:55:41 +0900
committerShinya Maeda <shinya@gitlab.com>2017-11-16 02:55:41 +0900
commit64e6fa6fee029cbdcace8f91673b52594e7f7acb (patch)
tree702e5b53443cececd4ef5983ee506f4db1805afc
parent69953fae36560773a06bbc426747e3dac6aa1ae1 (diff)
downloadgitlab-ce-fix/sm/37991-avoid-deactivation-when-pipeline-schedules-execute-a-commit-includes-ci-skip.tar.gz
Avoid deactivation when pipeline schedules execute a commit includes `[ci skip]`fix/sm/37991-avoid-deactivation-when-pipeline-schedules-execute-a-commit-includes-ci-skip
-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