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

Merge Request uses StateMachine now

Browse source
This commit is contained in:
Andrew8xx8 2013-02-18 12:40:56 +04:00
parent f97296597c
commit b45e9aefd3
15 changed files with 107 additions and 132 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/merge_requests_controller.rb
View file

@ -80,7 +80,7 @@ class MergeRequestsController < ProjectResourceController
def automerge
return access_denied! unless can?(current_user, :accept_mr, @project)
if @merge_request.open? && @merge_request.can_be_merged?
if @merge_request.opened? && @merge_request.can_be_merged?
@merge_request.should_remove_source_branch = params[:should_remove_source_branch]
@merge_request.automerge!(current_user)
@status = true