From 19bd91b907359e29acb4eaf5b7f119770767e14c Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Tue, 16 Jun 2015 16:40:10 +0200 Subject: [PATCH] Return rebase-before-merge checkbox Signed-off-by: Dmitriy Zaporozhets --- .../projects/merge_requests/widget/open/_accept.html.haml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/views/projects/merge_requests/widget/open/_accept.html.haml b/app/views/projects/merge_requests/widget/open/_accept.html.haml index 41aa66dd76..4b0bef4315 100644 --- a/app/views/projects/merge_requests/widget/open/_accept.html.haml +++ b/app/views/projects/merge_requests/widget/open/_accept.html.haml @@ -9,6 +9,12 @@ = label_tag :should_remove_source_branch, class: "remove_source_checkbox" do = check_box_tag :should_remove_source_branch Remove source-branch + - if @merge_request.target_project.merge_requests_rebase_enabled && can_rebase?(@merge_request.target_project, @merge_request.target_branch) + .accept-control.remove_branch_holder.checkbox + = label_tag :should_rebase do + = check_box_tag :should_rebase, "1", @project.merge_requests_rebase_default + %strong Rebase before merge + .accept-control = link_to "#", class: "modify-merge-commit-link js-toggle-button", title: "Modify merge commit message" do %i.fa.fa-edit