diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2017-11-07 23:47:50 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-11-09 16:59:52 +0800 |
| commit | c00fde606ee2d8f87a13c801efc3278396f6bb7f (patch) | |
| tree | 9fe7e23b1e9c1c17c4988c0c775c9663a9530c19 /app/models/ci | |
| parent | 760b2c75ef9d2c6acb655860dceae4c04cd8e5a7 (diff) | |
| download | gitlab-ce-c00fde606ee2d8f87a13c801efc3278396f6bb7f.tar.gz | |
Make sure all pipelines would go to pending once39884-fix-pipeline-transition-with-single-manual-action
Without this fix, pipeline could go from skipped to
running directly, bypassing the transition for:
[:created, :pending] => :running
And this is responsible for setting up started_at.
Without this fix, started_at would never be set.
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/39884
Diffstat (limited to 'app/models/ci')
| -rw-r--r-- | app/models/ci/pipeline.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb index fcbe3d2b67b..19814864e50 100644 --- a/app/models/ci/pipeline.rb +++ b/app/models/ci/pipeline.rb @@ -66,8 +66,8 @@ module Ci state_machine :status, initial: :created do event :enqueue do - transition created: :pending - transition [:success, :failed, :canceled, :skipped] => :running + transition [:created, :skipped] => :pending + transition [:success, :failed, :canceled] => :running end event :run do |