summaryrefslogtreecommitdiff
path: root/app/models/commit_status.rb
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-09-19 14:13:08 +0200
committerKamil Trzcinski <ayufan@ayufan.eu>2016-09-19 15:06:26 +0200
commitde61efed0f3208f6148ac878d9cc97e65b795d18 (patch)
tree8505af7b61a958316630e5b737ff15f9249780a4 /app/models/commit_status.rb
parentc20e4267e89c1fa84b3eeb9f63e17677388c25e3 (diff)
downloadgitlab-ce-de61efed0f3208f6148ac878d9cc97e65b795d18.tar.gz
Fix processing of events when build finished.
This solves Pipelines in `running` after all stages do finish.
Diffstat (limited to 'app/models/commit_status.rb')
-rw-r--r--app/models/commit_status.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/app/models/commit_status.rb b/app/models/commit_status.rb
index c85561291c8..736db1ab0f6 100644
--- a/app/models/commit_status.rb
+++ b/app/models/commit_status.rb
@@ -69,15 +69,15 @@ class CommitStatus < ActiveRecord::Base
commit_status.update_attributes finished_at: Time.now
end
- after_transition do |commit_status, transition|
- commit_status.pipeline.try(:build_updated) unless transition.loopback?
- end
-
after_transition any => [:success, :failed, :canceled] do |commit_status|
commit_status.pipeline.try(:process!)
true
end
+ after_transition do |commit_status, transition|
+ commit_status.pipeline.try(:build_updated) unless transition.loopback?
+ end
+
after_transition [:created, :pending, :running] => :success do |commit_status|
MergeRequests::MergeWhenBuildSucceedsService.new(commit_status.pipeline.project, nil).trigger(commit_status)
end