deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Link for auto merge, db field for MR

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-03-30 00:27:42 +03:00
parent 78d620b3b6
commit cd74f9da91
5 changed files with 61 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

15
app/controllers/merge_requests_controller.rb
View file

@ -96,18 +96,23 @@ class MergeRequestsController < ApplicationController
end
def automerge
render_404 unless @merge_request.open?
message = ""
if GitlabMerge.new(@merge_request).merge
@merge_request.update_attributes(
:author_id_of_changes => current_user.id,
:closed => true
)
@merge_request.reload_code
@merge_request.merge!(current_user.id)
message = "Successfully merged"
else
@merge_request.mark_as_unmergable
message = "Can not be merged"
end
redirect_to [@merge_request.project, @merge_request], :alert => message
rescue => ex
@merge_request.mark_as_unmergable
message = "Can not be merged"
ensure
redirect_to [@merge_request.project, @merge_request], :alert => message
end