Commit 423390a2 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Separate accept MR settings from manual merge instructions. Remove confusing `click here` links

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent aaa2bbd7
...@@ -15,34 +15,35 @@ ...@@ -15,34 +15,35 @@
= form_for [:automerge, @project, @merge_request], remote: true, method: :post do |f| = form_for [:automerge, @project, @merge_request], remote: true, method: :post do |f|
%h4 %h4
You can accept this request automatically. You can accept this request automatically.
%div .accept-merge-holder.clearfix
If you still want to do it manually - .js-toggle-container
%strong %p
= link_to "click here", "#modal_merge_info", class: "how_to_merge_link vlink", title: "How To Merge", "data-toggle" => "modal" You can
for instructions. %strong= link_to "modify merge commit message", "#", class: "modify-merge-commit-link js-toggle-button", title: "Modify merge commit message"
before accepting merge request
.js-toggle-content.hide
.form-group
= label_tag :merge_commit_message, "Commit message", class: 'control-label'
.col-sm-10
= render 'shared/commit_message_container', {textarea: text_area_tag(:merge_commit_message,
@merge_request.merge_commit_message, class: "form-control js-gfm-input", rows: 14, required: true)}
%p.hint
The recommended maximum line length is 52 characters for the first line and 72 characters for all following lines.
.js-toggle-container .accept-group
%p .pull-left
If you want to modify merge commit message - = f.submit "Accept Merge Request", class: "btn btn-create accept_merge_request"
%strong - if can_remove_branch?(@merge_request.source_project, @merge_request.source_branch) && !@merge_request.for_fork?
= link_to "click here", "#", class: "modify-merge-commit-link js-toggle-button", title: "Modify merge commit message" .remove_branch_holder.pull-left
.js-toggle-content.hide = label_tag :should_remove_source_branch, class: "checkbox" do
.form-group = check_box_tag :should_remove_source_branch
= label_tag :merge_commit_message, "Commit message", class: 'control-label' Remove source-branch
.col-sm-10
= render 'shared/commit_message_container', {textarea: text_area_tag(:merge_commit_message,
@merge_request.merge_commit_message, class: "form-control js-gfm-input", rows: 14, required: true)}
%p.hint
The recommended maximum line length is 52 characters for the first line and 72 characters for all following lines.
.accept-group %hr
.pull-left .light
= f.submit "Accept Merge Request", class: "btn btn-create accept_merge_request" If you still want to merge this request manually - use
- if can_remove_branch?(@merge_request.source_project, @merge_request.source_branch) && !@merge_request.for_fork? %strong
.remove_branch_holder.pull-left = link_to "command line", "#modal_merge_info", class: "how_to_merge_link vlink", title: "How To Merge", "data-toggle" => "modal"
= label_tag :should_remove_source_branch, class: "checkbox" do
= check_box_tag :should_remove_source_branch
Remove source-branch
.automerge_widget.no_satellite.hide .automerge_widget.no_satellite.hide
......
Markdown is supported
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