Commit 22ec3fa1 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Fix MR css for accept MR block

parent e5ff5c28
...@@ -47,6 +47,7 @@ ...@@ -47,6 +47,7 @@
} }
label { label {
color: #444; color: #444;
text-align: left
} }
} }
......
...@@ -9,19 +9,19 @@ ...@@ -9,19 +9,19 @@
%span %span
= form_for [:automerge, @project, @merge_request], remote: true, method: :get do |f| = form_for [:automerge, @project, @merge_request], remote: true, method: :get do |f|
%p %p
You can accept this request automatically. You can accept this request automatically.
If you still want to do it manually - If you still want to do it manually -
%strong= link_to "click here", "#", class: "how_to_merge_link vlink", title: "How To Merge" %strong= link_to "click here", "#", class: "how_to_merge_link vlink", title: "How To Merge"
for instructions for instructions
.accept_group .accept_group
= f.submit "Accept Merge Request", class: "btn small success accept_merge_request" = f.submit "Accept Merge Request", class: "btn success accept_merge_request"
- unless @project.root_ref? @merge_request.source_branch - unless @project.root_ref? @merge_request.source_branch
.remove_branch_holder .remove_branch_holder
= label_tag :should_remove_source_branch, class: "checkbox" do = label_tag :should_remove_source_branch, class: "checkbox" do
= check_box_tag :should_remove_source_branch = check_box_tag :should_remove_source_branch
Remove source-branch Remove source-branch
.clearfix .clearfix
.automerge_widget.cannot_be_merged{style: "display:none"} .automerge_widget.cannot_be_merged{style: "display:none"}
.alert.alert-info .alert.alert-info
......
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