Developers can merge MR if target branch is not protected

2013-02-27 20:20:31 +02:00 · 2013-02-27 20:20:31 +02:00 · 92039dd677
commit 92039dd677
parent 33cd1ae9dc
4 changed files with 20 additions and 7 deletions
--- a/app/views/merge_requests/show/_mr_accept.html.haml
+++ b/app/views/merge_requests/show/_mr_accept.html.haml
@ -1,9 +1,9 @@
- 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