diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-10-13 11:10:47 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-10-13 11:10:47 +0000 |
| commit | c616200f821be630d6238a00ff08a77a60aeebe2 (patch) | |
| tree | 3b1df8fc6f640bad31b9cb7241fc5cfa3133a166 /app | |
| parent | 5843a43c16e007193f5e26522d1e7368a0bdb2d7 (diff) | |
| parent | b78954c13d127d84fa1e10db83f51b23790aa526 (diff) | |
| download | gitlab-ce-c616200f821be630d6238a00ff08a77a60aeebe2.tar.gz | |
Merge branch '39032-improve-merge-ongoing-check-consistency' into 'master'
Make "merge ongoing" check more consistent
Closes #39032
See merge request gitlab-org/gitlab-ce!14825
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 972a35dde4d..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? + !!merge_jid && !merged? && Gitlab::SidekiqStatus.running?(merge_jid) end def closed_without_fork? |