diff options
| author | Oswaldo Ferreira <oswaldo@gitlab.com> | 2017-10-11 18:21:25 +0200 |
|---|---|---|
| committer | Oswaldo Ferreira <oswaldo@gitlab.com> | 2017-10-11 18:48:39 +0200 |
| commit | 9ab0254085cc4eed5cda322b6d5998c320ceef2c (patch) | |
| tree | 10d431117f17496aa9ea0bb448504fbca4590038 /app/models/merge_request.rb | |
| parent | efeaf3bd41e60be1405b7e3ccfcfb6cb4747518c (diff) | |
| download | gitlab-ce-9ab0254085cc4eed5cda322b6d5998c320ceef2c.tar.gz | |
Make "merge ongoing" check more consistent
Diffstat (limited to 'app/models/merge_request.rb')
| -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 972a35dde4d..e34714e3f9e 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? + !!merge_jid && !merged? && Gitlab::SidekiqStatus.num_running([merge_jid]) > 0 end def closed_without_fork? |