diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-04-14 07:48:29 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-04-14 07:48:29 +0000 |
| commit | 79b4d0b0c0682fc31d794d8b42d02b3d1bb5b9dc (patch) | |
| tree | 5e6c0b79d113287774728886de2b802a5c1d0c75 | |
| parent | a1e147ce223ee52066e7f0ce77ece82eb2dc6bbe (diff) | |
| parent | fb1cd0a842a71903bf54e32aed84ed43254be552 (diff) | |
| download | gitlab-ce-79b4d0b0c0682fc31d794d8b42d02b3d1bb5b9dc.tar.gz | |
Merge branch 'fix-stuck-mr' into 'master'
fix stuck MR
If `locked_at` is `nil` return that the merge has been locked long enough and those are old merges stuck in locked state.
Fixes #348. Related to 6487419364fa9c179e24028d85b2be10d574067f.
See merge request !517
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/models/merge_request.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index b27fd55433b..3dd8af32d0d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -74,6 +74,7 @@ v 7.10.0 (unreleased) - Automatically setup GitLab CI project for forks if origin project has GitLab CI enabled - Bust group page project list cache when namespace name or path changes. - Explicitly set image alt-attribute to prevent graphical glitches if gravatars could not be loaded + - Fix stuck Merge Request merging events from old installations (Ben Bodenmiller) v 7.9.3 - Contains no changes diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 35cb920d8bc..92026356b62 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -361,6 +361,6 @@ class MergeRequest < ActiveRecord::Base end def locked_long_ago? - locked_at && locked_at < (Time.now - 1.day) + locked_at.nil? || locked_at < (Time.now - 1.day) end end |