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

Developers can merge MR if target branch is not protected

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2013-02-27 20:20:31 +02:00
parent 33cd1ae9dc
commit 92039dd677
4 changed files with 20 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
app/controllers/merge_requests_controller.rb
View file

@ -81,7 +81,8 @@ class MergeRequestsController < ProjectResourceController
end
def automerge
return access_denied! unless can?(current_user, :accept_mr, @project)
return access_denied! unless allowed_to_merge?
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)
@ -143,5 +144,18 @@ class MergeRequestsController < ProjectResourceController
# or from cache if already merged
@commits = @merge_request.commits
@commits = CommitDecorator.decorate(@commits)
@allowed_to_merge = allowed_to_merge?
@show_merge_controls = @merge_request.opened? && @commits.any? && @allowed_to_merge
end
def allowed_to_merge?
action = if project.protected_branch?(@merge_request.target_branch)
:push_code_to_protected_branches
else
:push_code
end
can?(current_user, action, @project)
end
end