Commit 92039dd6 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Developers can merge MR if target branch is not protected

parent 33cd1ae9
......@@ -81,7 +81,8 @@ def automerge_check
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 @@ def define_show_vars
# 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
......@@ -91,7 +91,6 @@ def project_master_rules
:admin_team_member,
:admin_merge_request,
:admin_note,
:accept_mr,
:admin_wiki,
:admin_project
]
......
......@@ -19,6 +19,8 @@ def execute(project, user, oldrev, newrev, ref)
# Collect data for this git push
@push_data = post_receive_data(oldrev, newrev, ref)
 
create_push_event
project.ensure_satellite_exists
project.discover_default_branch
 
......@@ -27,8 +29,6 @@ def execute(project, user, oldrev, newrev, ref)
project.execute_hooks(@push_data.dup)
project.execute_services(@push_data.dup)
end
create_push_event
end
 
# This method provide a sample data
......
- unless can?(current_user, :accept_mr, @project)
- unless @allowed_to_merge
.alert
%strong Only masters can accept MR
%strong You don't have enough permissions to merge this MR
 
 
- if @merge_request.opened? && @commits.any? && can?(current_user, :accept_mr, @project)
- if @show_merge_controls
.automerge_widget.can_be_merged{style: "display:none"}
.alert.alert-success
%span
......
Supports Markdown
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