From fb1cd0a842a71903bf54e32aed84ed43254be552 Mon Sep 17 00:00:00 2001 From: Ben Bodenmiller Date: Tue, 14 Apr 2015 00:15:34 -0700 Subject: fix stuck MR fixes #348. related to 6487419364fa9c179e24028d85b2be10d574067f. --- app/models/merge_request.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/models/merge_request.rb') diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 35cb920d8bc..92026356b62 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 && locked_at < (Time.now - 1.day) + locked_at.nil? || locked_at < (Time.now - 1.day) end end -- cgit v1.2.1