Merge branch 'fix-stuck-mr' into 'master'

fix stuck mr If `locked?` & `locked_at.nil?` is nil return that the merge has been locked long enough and those are old merges stuck in locked state. Fixes #348. Related to 64874193. Replaces !517. /cc @DouweM See merge request !526

Merge branch 'fix-stuck-mr' into 'master'
b409c376 · Douwe Maan · 63b21945 · f517dd26 · b409c376 · b409c376
Commit b409c376 authored Apr 15, 2015 by Douwe Maan
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

CHANGELOG CHANGELOG +1 -0

merge_request.rb app/models/merge_request.rb +3 -1

No files found.
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -76,6 +76,7 @@ v 7.10.0 (unreleased)
  - 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
  - Allow user to choose a public email to show on public profile
+  - Fix stuck Merge Request merging events from old installations (Ben Bodenmiller)

 v 7.9.3
  - Contains no changes

--- 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