Commit 79b4d0b0 authored by Douwe Maan's avatar Douwe Maan

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

See merge request !517
parents a1e147ce fb1cd0a8
...@@ -74,6 +74,7 @@ v 7.10.0 (unreleased) ...@@ -74,6 +74,7 @@ v 7.10.0 (unreleased)
- Automatically setup GitLab CI project for forks if origin project has GitLab CI enabled - 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. - 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 - 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 v 7.9.3
- Contains no changes - Contains no changes
......
...@@ -361,6 +361,6 @@ class MergeRequest < ActiveRecord::Base ...@@ -361,6 +361,6 @@ class MergeRequest < ActiveRecord::Base
end end
def locked_long_ago? def locked_long_ago?
locked_at && locked_at < (Time.now - 1.day) locked_at.nil? || locked_at < (Time.now - 1.day)
end end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment