Commit 6baf9971 authored by Lin Jen-Shin's avatar Lin Jen-Shin

Revert "reload instead, so that we don't have to change order"

This reverts commit 575dc2b0.
parent 575dc2b0
...@@ -69,22 +69,15 @@ class CommitStatus < ActiveRecord::Base ...@@ -69,22 +69,15 @@ class CommitStatus < ActiveRecord::Base
commit_status.update_attributes finished_at: Time.now commit_status.update_attributes finished_at: Time.now
end end
# We use around_transition to process pipeline on next stages as soon as possible, before the `after_*` is executed after_transition do |commit_status, transition|
around_transition any => [:success, :failed, :canceled] do |commit_status, block| commit_status.pipeline.try(:build_updated) unless transition.loopback?
block.call end
after_transition any => [:success, :failed, :canceled] do |commit_status|
commit_status.pipeline.try(:process!) commit_status.pipeline.try(:process!)
true true
end end
after_transition do |commit_status, transition|
pipeline = commit_status.pipeline
if !transition.loopback? && pipeline
pipeline.reload
pipeline.build_updated
end
end
after_transition [:created, :pending, :running] => :success do |commit_status| after_transition [:created, :pending, :running] => :success do |commit_status|
MergeRequests::MergeWhenBuildSucceedsService.new(commit_status.pipeline.project, nil).trigger(commit_status) MergeRequests::MergeWhenBuildSucceedsService.new(commit_status.pipeline.project, nil).trigger(commit_status)
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment