diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2017-05-21 10:00:59 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2017-05-21 10:00:59 +0000 |
| commit | fe1a814bc6b34496b792fbcce852c8035ec436b5 (patch) | |
| tree | 5e5ecb84fce04a3fa212884ef44a6e91b222c0da /app | |
| parent | f5f99c9037e52392ca388b6e839d93df88421c31 (diff) | |
| parent | f71a9de14d118fb14666df9f78365779308312e1 (diff) | |
| download | gitlab-ce-fe1a814bc6b34496b792fbcce852c8035ec436b5.tar.gz | |
Merge branch 'fix/gb/exclude-manual-actions-from-cancelable-jobs' into 'master'
Exclude manual actions when checking if pipeline can be canceled
Closes #31107
See merge request !11562
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/concerns/has_status.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/concerns/has_status.rb b/app/models/concerns/has_status.rb index dff7b6e3523..3c9c6584e02 100644 --- a/app/models/concerns/has_status.rb +++ b/app/models/concerns/has_status.rb @@ -82,7 +82,7 @@ module HasStatus scope :failed_or_canceled, -> { where(status: [:failed, :canceled]) } scope :cancelable, -> do - where(status: [:running, :pending, :created, :manual]) + where(status: [:running, :pending, :created]) end end |