summaryrefslogtreecommitdiff
path: root/app/models/merge_request.rb
diff options
context:
space:
mode:
authorFelipe Artur <felipefac@gmail.com>2017-12-11 19:00:11 -0200
committerFelipe Artur <felipefac@gmail.com>2017-12-13 12:15:04 -0200
commit7ccb283da490a6f2cacaf06bbe6b3f7ae155d870 (patch)
tree2e7b28fee9133b2cf2f936207367153e75009025 /app/models/merge_request.rb
parent0cdc840b7fd710e58130a06e94d508c7c8cb133b (diff)
downloadgitlab-ce-7ccb283da490a6f2cacaf06bbe6b3f7ae155d870.tar.gz
Prevent worker that updates merge requests head pipeline from failing jobsissue_41021
Diffstat (limited to 'app/models/merge_request.rb')
-rw-r--r--app/models/merge_request.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 422f138c4ea..c40e2a09012 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -83,6 +83,12 @@ class MergeRequest < ActiveRecord::Base
transition locked: :opened
end
+ before_transition any => :opened do |merge_request|
+ Sidekiq::Worker.skipping_transaction_check do
+ UpdateHeadPipelineForMergeRequestWorker.perform_async(merge_request.id)
+ end
+ end
+
state :opened
state :closed
state :merged