summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzegorz@gitlab.com>2018-08-10 12:37:01 +0000
committerGrzegorz Bizon <grzegorz@gitlab.com>2018-08-10 12:37:01 +0000
commit91795dcd1c0d12d2350e0d00489d89be9fa29b32 (patch)
treec3e6ec1b4fa452bd0bd4077344b61918f7077dbf /app
parent52646106754a4eae02c6ae0c988508981c4f8e39 (diff)
parentc6301865b9b608d99330559d0bd3c54bad44a5f7 (diff)
downloadgitlab-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
Diffstat (limited to 'app')
-rw-r--r--app/models/ci/build.rb2
1 files changed, 1 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?