summaryrefslogtreecommitdiff
path: root/app/models/merge_request.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-12-05 16:02:08 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-12-05 16:02:08 +0200
commit6487419364fa9c179e24028d85b2be10d574067f (patch)
tree45fc7b4a0a7f6bb8af9fda1bfec736519a1f3c75 /app/models/merge_request.rb
parentb23f71ec4d76bc1a6ed4b6c1add8dbc8fb32eb40 (diff)
downloadgitlab-ce-6487419364fa9c179e24028d85b2be10d574067f.tar.gz
Automatically close merge requests that were locker for 1 day
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/models/merge_request.rb')
-rw-r--r--app/models/merge_request.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index e558c4164e9..2cc427d35c2 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -346,4 +346,8 @@ class MergeRequest < ActiveRecord::Base
source_project.repository.branch_names
end
end
+
+ def locked_long_ago?
+ locked_at && locked_at < (Time.now - 1.day)
+ end
end