diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-06-15 12:36:02 +0300 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2017-06-15 19:01:39 +0300 |
| commit | a7624da1502d0a5054c30d3643a857c902b4562d (patch) | |
| tree | 71a8d0b8126c6b76d3e62b27454b77ad83965169 /app/models | |
| parent | 279f4a1c5ce86efc1bcba3f5085d4ca0a9067228 (diff) | |
Merge branch 'fix-manual-actions' into 'master'
Do not show manual actions that cannot be run
Closes #32380
See merge request !12121
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/ci/build.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb index cec1ca89a6a..58758f7ca8a 100644 --- a/app/models/ci/build.rb +++ b/app/models/ci/build.rb @@ -33,7 +33,7 @@ module Ci scope :with_artifacts_not_expired, ->() { with_artifacts.where('artifacts_expire_at IS NULL OR artifacts_expire_at > ?', Time.now) } scope :with_expired_artifacts, ->() { with_artifacts.where('artifacts_expire_at < ?', Time.now) } scope :last_month, ->() { where('created_at > ?', Date.today - 1.month) } - scope :manual_actions, ->() { where(when: :manual).relevant } + scope :manual_actions, ->() { where(when: :manual, status: COMPLETED_STATUSES + [:manual]) } mount_uploader :artifacts_file, ArtifactUploader mount_uploader :artifacts_metadata, ArtifactUploader @@ -109,7 +109,7 @@ module Ci end def playable? - action? && manual? + action? && (manual? || complete?) end def action? |