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

Auto-merge: 'already can not be merged' alert

Browse source
This commit is contained in:
Valery Sizov 2012-04-16 23:05:08 +03:00
parent 8269a3a735
commit a8e4f3ed88
4 changed files with 25 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/controllers/merge_requests_controller.rb
View file

@ -104,9 +104,13 @@ class MergeRequestsController < ApplicationController
end
def automerge
render_404 unless @merge_request.open? && @merge_request.can_be_merged?
return access_denied! unless can?(current_user, :accept_mr, @project)
@merge_request.automerge!(current_user)
if @merge_request.open? && @merge_request.can_be_merged?
@merge_request.automerge!(current_user)
@status = true
else
@status = false
end
end
def destroy