diff options
| author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-10-08 20:34:45 +0200 |
|---|---|---|
| committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-10-08 20:34:45 +0200 |
| commit | 3fb4d86c6dbb2298f6d5b0010ae0f6e26905b934 (patch) | |
| tree | 7197133cbdf104d4b5683bbbeeae64acdfa53b19 | |
| parent | 74fd5cab155cb83ef47ba8f4e78ccfd714f73211 (diff) | |
| download | gitlab-ce-3fb4d86c6dbb2298f6d5b0010ae0f6e26905b934.tar.gz | |
Add temporary fix for race condition in MWBS
| -rw-r--r-- | app/models/commit_status.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/models/commit_status.rb b/app/models/commit_status.rb index 81f041cf29e..c8b168f5526 100644 --- a/app/models/commit_status.rb +++ b/app/models/commit_status.rb @@ -99,6 +99,9 @@ class CommitStatus < ActiveRecord::Base after_transition [:created, :pending, :running] => :success do |commit_status| commit_status.run_after_commit do + # TODO, temporary fix for race condition + UpdatePipelineWorker.new.perform(pipeline.id) + MergeRequests::MergeWhenBuildSucceedsService .new(pipeline.project, nil).trigger(self) end |