diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2017-11-14 10:46:07 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2017-11-14 10:46:07 +0000 |
| commit | 6b9b516007c8dda88f33e9603a6880e3fc3ff103 (patch) | |
| tree | c6b9ddc30d54cc043bf474c69f5812268623fe7f /app/models | |
| parent | 8902bdec4d54de0e50657c897a9ade413c443924 (diff) | |
| parent | c00fde606ee2d8f87a13c801efc3278396f6bb7f (diff) | |
| download | gitlab-ce-6b9b516007c8dda88f33e9603a6880e3fc3ff103.tar.gz | |
Merge branch '39884-fix-pipeline-transition-with-single-manual-action' into 'master'
Make sure all pipelines would go to pending once
Closes #39884
See merge request gitlab-org/gitlab-ce!15251
Diffstat (limited to 'app/models')
| -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 |