diff options
| author | Oswaldo Ferreira <oswaldo@gitlab.com> | 2017-10-13 10:17:41 +0200 |
|---|---|---|
| committer | Oswaldo Ferreira <oswaldo@gitlab.com> | 2017-10-13 10:17:41 +0200 |
| commit | b78954c13d127d84fa1e10db83f51b23790aa526 (patch) | |
| tree | eacba23ba4cbb4f24f2daa2330f72f56343e6619 /app | |
| parent | 9ab0254085cc4eed5cda322b6d5998c320ceef2c (diff) | |
| download | gitlab-ce-b78954c13d127d84fa1e10db83f51b23790aa526.tar.gz | |
Simplify check for running job on Redis39032-improve-merge-ongoing-check-consistency
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/merge_request.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index e34714e3f9e..c3fae16d109 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -396,7 +396,7 @@ class MergeRequest < ActiveRecord::Base end def merge_ongoing? - !!merge_jid && !merged? && Gitlab::SidekiqStatus.num_running([merge_jid]) > 0 + !!merge_jid && !merged? && Gitlab::SidekiqStatus.running?(merge_jid) end def closed_without_fork? |