Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelipe Artur <felipefac@gmail.com>2017-12-12 00:00:11 +0300
committerFelipe Artur <felipefac@gmail.com>2017-12-13 18:36:52 +0300
commit504f77b43a92362b07899e946855dc689b45b3ae (patch)
treead394ad0c53b3b3283a375a16e8097b543543f72 /app/models/merge_request.rb
parent0cdc840b7fd710e58130a06e94d508c7c8cb133b (diff)
Prevent worker that updates merge requests head pipeline from failing jobs
Diffstat (limited to 'app/models/merge_request.rb')
-rw-r--r--app/models/merge_request.rb8
1 files changed, 8 insertions, 0 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 422f138c4ea..fc9018e65a1 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -83,6 +83,14 @@ class MergeRequest < ActiveRecord::Base
transition locked: :opened
end
+ before_transition any => :opened do |merge_request|
+ merge_request.merge_jid = nil
+
+ merge_request.run_after_commit do
+ UpdateHeadPipelineForMergeRequestWorker.perform_async(merge_request.id)
+ end
+ end
+
state :opened
state :closed
state :merged