diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-04-14 12:03:23 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-04-14 12:03:23 +0300 |
| commit | ae6d0aaae0d8f6251b30a8e5243a98f083f0cac9 (patch) | |
| tree | b167bdeaaaf46b2410b0199fd1ffdcf4c9fe7d67 | |
| parent | 6b479b6cb0f368341e39b1527e833ab670b95022 (diff) | |
Revert "Merge branch 'fix-stuck-mr' into 'master'"
This reverts commit 79b4d0b0c0682fc31d794d8b42d02b3d1bb5b9dc, reversing
changes made to a1e147ce223ee52066e7f0ce77ece82eb2dc6bbe.
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/models/merge_request.rb | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG index fc721d3d155..f133cb24780 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -73,7 +73,6 @@ 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 92026356b62..35cb920d8bc 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.nil? || locked_at < (Time.now - 1.day) + locked_at && locked_at < (Time.now - 1.day) end end |