diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-07 15:07:34 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-07 15:07:34 +0000 |
| commit | b4028d450087e97f26d4baa23e08396bcbabe3e0 (patch) | |
| tree | f84a5cbb29e43bab0ba58db1bc5619112c8c482e /app/models/concerns | |
| parent | 05f1d5d9813332bdd456cb358517e56168a24224 (diff) | |
| download | gitlab-ce-b4028d450087e97f26d4baa23e08396bcbabe3e0.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/concerns')
| -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 7fd21c29c82..e06dad38c32 100644 --- a/app/models/concerns/has_status.rb +++ b/app/models/concerns/has_status.rb @@ -7,7 +7,7 @@ module HasStatus BLOCKED_STATUS = %w[manual scheduled].freeze AVAILABLE_STATUSES = %w[created waiting_for_resource preparing pending running success failed canceled skipped manual scheduled].freeze STARTED_STATUSES = %w[running success failed skipped manual scheduled].freeze - ACTIVE_STATUSES = %w[preparing pending running].freeze + ACTIVE_STATUSES = %w[waiting_for_resource preparing pending running].freeze COMPLETED_STATUSES = %w[success failed canceled skipped].freeze ORDERED_STATUSES = %w[failed preparing pending running waiting_for_resource manual scheduled canceled success skipped created].freeze PASSED_WITH_WARNINGS_STATUSES = %w[failed canceled].to_set.freeze |