Revert "Merge branch 'fix-stuck-mr' into 'master'"
This reverts commit79b4d0b0c0
, reversing changes made toa1e147ce22
.
This commit is contained in:
parent
6b479b6cb0
commit
ae6d0aaae0
|
@ -73,7 +73,6 @@ 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
|
||||||
end
|
end
|
||||||
|
|
||||||
def locked_long_ago?
|
def locked_long_ago?
|
||||||
locked_at.nil? || locked_at < (Time.now - 1.day)
|
locked_at && locked_at < (Time.now - 1.day)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue