Merge branch 'improve-merge-widget' into 'master'
Improve merge widget * remove title `You can merge it` since button below says same * fixed layout for custom commit message * make button a bit bigger See merge request !1365
This commit is contained in:
commit
ac1584249c
3 changed files with 37 additions and 23 deletions
|
@ -11,10 +11,27 @@
|
|||
}
|
||||
}
|
||||
|
||||
.accept-group {
|
||||
label {
|
||||
margin: 5px;
|
||||
.accept-merge-holder {
|
||||
margin-top: 5px;
|
||||
|
||||
.accept-action {
|
||||
display: inline-block;
|
||||
|
||||
.accept_merge_request {
|
||||
padding: 10px 20px;
|
||||
}
|
||||
}
|
||||
|
||||
.accept-control {
|
||||
display: inline-block;
|
||||
margin-left: 20px;
|
||||
padding: 10px 0;
|
||||
line-height: 20px;
|
||||
font-weight: bold;
|
||||
|
||||
.checkbox {
|
||||
margin: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -13,25 +13,22 @@
|
|||
.automerge_widget.can_be_merged.hide
|
||||
.clearfix
|
||||
= form_for [:automerge, @project, @merge_request], remote: true, method: :post do |f|
|
||||
%h4
|
||||
You can accept this request automatically.
|
||||
.accept-merge-holder.clearfix
|
||||
.accept-group
|
||||
.pull-left
|
||||
= f.submit "Accept Merge Request", class: "btn btn-create accept_merge_request"
|
||||
- if can_remove_branch?(@merge_request.source_project, @merge_request.source_branch) && !@merge_request.for_fork?
|
||||
.remove_branch_holder.pull-left
|
||||
= label_tag :should_remove_source_branch, class: "checkbox" do
|
||||
= check_box_tag :should_remove_source_branch
|
||||
Remove source-branch
|
||||
.js-toggle-container
|
||||
%label
|
||||
%i.fa.fa-edit
|
||||
= link_to "modify merge commit message", "#", class: "modify-merge-commit-link js-toggle-button", title: "Modify merge commit message"
|
||||
.js-toggle-content.hide
|
||||
= render 'shared/commit_message_container', params: params,
|
||||
text: @merge_request.merge_commit_message,
|
||||
rows: 14, hint: true
|
||||
.accept-merge-holder.clearfix.js-toggle-container
|
||||
.accept-action
|
||||
= f.submit "Accept Merge Request", class: "btn btn-create accept_merge_request"
|
||||
- if can_remove_branch?(@merge_request.source_project, @merge_request.source_branch) && !@merge_request.for_fork?
|
||||
.accept-control
|
||||
= label_tag :should_remove_source_branch, class: "checkbox" do
|
||||
= check_box_tag :should_remove_source_branch
|
||||
Remove source-branch
|
||||
.accept-control
|
||||
= link_to "#", class: "modify-merge-commit-link js-toggle-button", title: "Modify merge commit message" do
|
||||
%i.fa.fa-edit
|
||||
Modify commit message
|
||||
.js-toggle-content.hide.prepend-top-20
|
||||
= render 'shared/commit_message_container', params: params,
|
||||
text: @merge_request.merge_commit_message,
|
||||
rows: 14, hint: true
|
||||
|
||||
%hr
|
||||
.light
|
||||
|
|
|
@ -156,7 +156,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
|
|||
end
|
||||
|
||||
step 'merge request is mergeable' do
|
||||
page.should have_content 'You can accept this request automatically'
|
||||
page.should have_button 'Accept Merge Request'
|
||||
end
|
||||
|
||||
step 'I modify merge commit message' do
|
||||
|
|
Loading…
Reference in a new issue