summaryrefslogtreecommitdiff
path: root/app/models/merge_request.rb
diff options
context:
space:
mode:
Diffstat (limited to 'app/models/merge_request.rb')
-rw-r--r--app/models/merge_request.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 35cb920d8bc..9c9e2762507 100644
--- 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