summaryrefslogtreecommitdiff
path: root/app/models/commit_status.rb
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2017-02-07 11:43:25 +0100
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2017-02-13 15:11:21 +0100
commita70a83cf290d12ec83b79e35fd5e92375216fc43 (patch)
treedbbc1c0244f1edfa34f5516efa0620da73d62dac /app/models/commit_status.rb
parentb609ee55f23847e529cabd5b35f013a7293b380a (diff)
downloadgitlab-ce-a70a83cf290d12ec83b79e35fd5e92375216fc43.tar.gz
Skip buils that were canceled but not started yet
Diffstat (limited to 'app/models/commit_status.rb')
-rw-r--r--app/models/commit_status.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/commit_status.rb b/app/models/commit_status.rb
index 9547c57b2ae..e2ce5062f6f 100644
--- a/app/models/commit_status.rb
+++ b/app/models/commit_status.rb
@@ -65,7 +65,8 @@ class CommitStatus < ActiveRecord::Base
end
event :cancel do
- transition [:created, :pending, :running] => :canceled
+ transition [:pending, :running] => :canceled
+ transition [:created] => :skipped
end
before_transition created: [:pending, :running] do |commit_status|