diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2017-06-02 11:05:38 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2017-06-02 11:05:38 +0300 |
| commit | ea531e1effa51bcec84e50a69901e6eec7c789c1 (patch) | |
| tree | d3c1281deea1c9b2e8596cfa79a2e9d5cd4f7a10 /app/models/concerns/has_status.rb | |
| parent | 4d141cb30dfcad94db89bdc08f4ea907dc2f8bdf (diff) | |
| parent | fc56d2fbaa2a317813c9dd7ba36e584162175fe6 (diff) | |
| download | gitlab-ce-ea531e1effa51bcec84e50a69901e6eec7c789c1.tar.gz | |
Merge remote-tracking branch 'origin/master' into 25426-group-dashboard-ui
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/models/concerns/has_status.rb')
| -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 |