diff options
| author | Ben Bodenmiller <bbodenmiller@hotmail.com> | 2015-04-14 23:11:13 -0700 |
|---|---|---|
| committer | Ben Bodenmiller <bbodenmiller@hotmail.com> | 2015-04-14 23:11:13 -0700 |
| commit | f517dd2606e6d49a447cc952bd4b16ce017f1ddc (patch) | |
| tree | 54df669d10673b499391ec9aa0b6f780e6783466 | |
| parent | 4ab717ea6a65beca3e069ca8590c22c49085dc8c (diff) | |
| download | gitlab-ce-f517dd2606e6d49a447cc952bd4b16ce017f1ddc.tar.gz | |
fix stuck mr
fixes #348. related to 6487419364fa9c179e24028d85b2be10d574067f.
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/models/merge_request.rb | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index eab4ff4e6ad..d079c04406c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -73,6 +73,7 @@ v 7.10.0 (unreleased) - Fix git over ssh errors 'fatal: protocol error: bad line length character' - 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. + - 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..9c9e2762507 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -361,6 +361,8 @@ class MergeRequest < ActiveRecord::Base end def locked_long_ago? - locked_at && locked_at < (Time.now - 1.day) + return false unless locked? + + locked_at.nil? || locked_at < (Time.now - 1.day) end end |