diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2016-07-13 21:57:30 +0300 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-07-13 21:57:30 +0300 |
| commit | 530f5158e297f3cde27f3566cfe13bad74ba3b50 (patch) | |
| tree | 270507d396bacdae8a4aa3489edfff0f47b718ca /app/views/projects/protected_branches/_protected_branch.html.haml | |
| parent | 9b0ef1559f78e58b398e428763ff97dfdc53e186 (diff) | |
Revert "Merge branch '18193-developers-can-merge' into 'master'
"
This reverts commit 9ca633eb4c62231e4ddff5466c723cf8e2bdb25d, reversing
changes made to fb229bbf7970ba908962b837b270adf56f14098f.
Diffstat (limited to 'app/views/projects/protected_branches/_protected_branch.html.haml')
| -rw-r--r-- | app/views/projects/protected_branches/_protected_branch.html.haml | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/app/views/projects/protected_branches/_protected_branch.html.haml b/app/views/projects/protected_branches/_protected_branch.html.haml index 7fda7f96047..474aec3a97c 100644 --- a/app/views/projects/protected_branches/_protected_branch.html.haml +++ b/app/views/projects/protected_branches/_protected_branch.html.haml @@ -16,8 +16,6 @@ (branch was removed from repository) %td = check_box_tag("developers_can_push", protected_branch.id, protected_branch.developers_can_push, data: { url: url }) - %td - = check_box_tag("developers_can_merge", protected_branch.id, protected_branch.developers_can_merge, data: { url: url }) - if can_admin_project %td = link_to 'Unprotect', [@project.namespace.becomes(Namespace), @project, protected_branch], data: { confirm: 'Branch will be writable for developers. Are you sure?' }, method: :delete, class: "btn btn-warning btn-sm pull-right" |