diff options
author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2017-03-03 16:35:19 +0300 |
---|---|---|
committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2017-03-06 12:04:04 +0300 |
commit | ac5bd3b73c0255bb9307913a2d4338d0a431cac6 (patch) | |
tree | 7c95aad0abec0692e448b60f2d5ccf9d59919427 /app/models/commit_status.rb | |
parent | dd2409119183578b12148654899e8e29c6105572 (diff) |
Reinstitute a core `manual` status for manual actions
Diffstat (limited to 'app/models/commit_status.rb')
-rw-r--r-- | app/models/commit_status.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/app/models/commit_status.rb b/app/models/commit_status.rb index 9cdabf24677..6518f54cdff 100644 --- a/app/models/commit_status.rb +++ b/app/models/commit_status.rb @@ -25,13 +25,13 @@ class CommitStatus < ActiveRecord::Base end scope :failed_but_allowed, -> do - where(allow_failure: true, status: [:failed, :canceled, :blocked]) + where(allow_failure: true, status: [:failed, :canceled, :manual]) end scope :exclude_ignored, -> do # We want to ignore failed_but_allowed jobs where("allow_failure = ? OR status IN (?)", - false, all_state_names - [:failed, :canceled, :blocked]) + false, all_state_names - [:failed, :canceled, :manual]) end scope :retried, -> { where.not(id: latest) } @@ -42,11 +42,11 @@ class CommitStatus < ActiveRecord::Base state_machine :status do event :enqueue do - transition [:created, :skipped, :blocked] => :pending + transition [:created, :skipped, :manual] => :pending end event :process do - transition [:skipped, :blocked] => :created + transition [:skipped, :manual] => :created end event :run do @@ -66,7 +66,7 @@ class CommitStatus < ActiveRecord::Base end event :cancel do - transition [:created, :pending, :running, :blocked] => :canceled + transition [:created, :pending, :running, :manual] => :canceled end before_transition created: [:pending, :running] do |commit_status| @@ -86,7 +86,7 @@ class CommitStatus < ActiveRecord::Base commit_status.run_after_commit do pipeline.try do |pipeline| - if complete? || blocked? + if complete? || manual? PipelineProcessWorker.perform_async(pipeline.id) else PipelineUpdateWorker.perform_async(pipeline.id) |