Read about our upcoming Code of Conduct on this issue

Unverified Commit 64874193 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Automatically close merge requests that were locker for 1 day


Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent eb045eb35177
......@@ -225,6 +225,11 @@ def define_show_vars
@allowed_to_merge = allowed_to_merge?
@show_merge_controls = @merge_request.open? && @commits.any? && @allowed_to_merge
@source_branch = @merge_request.source_project.repository.find_branch(@merge_request.source_branch).try(:name)
if @merge_request.locked_long_ago?
@merge_request.unlock_mr
@merge_request.close
end
end
def allowed_to_merge?
......
......@@ -346,4 +346,8 @@ def source_branches
source_project.repository.branch_names
end
end
def locked_long_ago?
locked_at && locked_at < (Time.now - 1.day)
end
end
......@@ -11,8 +11,10 @@
- if @merge_request.closed?
%h4
Closed by #{link_to_member(@project, @merge_request.closed_event.author, avatar: false)}
#{time_ago_with_tooltip(@merge_request.closed_event.created_at)}
Closed
- if @merge_request.closed_event
by #{link_to_member(@project, @merge_request.closed_event.author, avatar: false)}
#{time_ago_with_tooltip(@merge_request.closed_event.created_at)}
%p Changes were not merged into target branch
- if @merge_request.merged?
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment