diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-08-10 12:37:01 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-08-10 12:37:01 +0000 |
| commit | 91795dcd1c0d12d2350e0d00489d89be9fa29b32 (patch) | |
| tree | c3e6ec1b4fa452bd0bd4077344b61918f7077dbf | |
| parent | 52646106754a4eae02c6ae0c988508981c4f8e39 (diff) | |
| parent | c6301865b9b608d99330559d0bd3c54bad44a5f7 (diff) | |
| download | gitlab-ce-91795dcd1c0d12d2350e0d00489d89be9fa29b32.tar.gz | |
Merge branch '48320-cancel-a-created-job' into 'master'
Resolve "CI: cancel/skip a job in "created" state using a button"
Closes #48320
See merge request gitlab-org/gitlab-ce!20635
| -rw-r--r-- | app/models/ci/build.rb | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/48320-cancel-a-created-job.yml | 5 | ||||
| -rw-r--r-- | spec/models/ci/build_spec.rb | 6 |
3 files changed, 12 insertions, 1 deletions
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb index 9292929be98..3c69677baf0 100644 --- a/app/models/ci/build.rb +++ b/app/models/ci/build.rb @@ -226,7 +226,7 @@ module Ci end def cancelable? - active? + active? || created? end def retryable? diff --git a/changelogs/unreleased/48320-cancel-a-created-job.yml b/changelogs/unreleased/48320-cancel-a-created-job.yml new file mode 100644 index 00000000000..3e7a9e9ae52 --- /dev/null +++ b/changelogs/unreleased/48320-cancel-a-created-job.yml @@ -0,0 +1,5 @@ +--- +title: Allows to cancel a Created job +merge_request: 20635 +author: Jacopo Beschi @jacopo-beschi +type: added diff --git a/spec/models/ci/build_spec.rb b/spec/models/ci/build_spec.rb index 32b8755ee9a..42b627b6823 100644 --- a/spec/models/ci/build_spec.rb +++ b/spec/models/ci/build_spec.rb @@ -1103,6 +1103,12 @@ describe Ci::Build do it { is_expected.to be_cancelable } end + + context 'when build is created' do + let(:build) { create(:ci_build, :created) } + + it { is_expected.to be_cancelable } + end end context 'when build is not cancelable' do |