Commit 22ec3fa14cb87fec3655d2666783d439618890c5
1 parent
e5ff5c28
Exists in
master
and in
4 other branches
Fix MR css for accept MR block
Showing
2 changed files
with
7 additions
and
6 deletions
Show diff stats
app/assets/stylesheets/sections/merge_requests.scss
app/views/merge_requests/show/_mr_accept.html.haml
| @@ -9,19 +9,19 @@ | @@ -9,19 +9,19 @@ | ||
| 9 | %span | 9 | %span |
| 10 | = form_for [:automerge, @project, @merge_request], remote: true, method: :get do |f| | 10 | = form_for [:automerge, @project, @merge_request], remote: true, method: :get do |f| |
| 11 | %p | 11 | %p |
| 12 | - You can accept this request automatically. | ||
| 13 | - If you still want to do it manually - | 12 | + You can accept this request automatically. |
| 13 | + If you still want to do it manually - | ||
| 14 | %strong= link_to "click here", "#", class: "how_to_merge_link vlink", title: "How To Merge" | 14 | %strong= link_to "click here", "#", class: "how_to_merge_link vlink", title: "How To Merge" |
| 15 | for instructions | 15 | for instructions |
| 16 | .accept_group | 16 | .accept_group |
| 17 | - = f.submit "Accept Merge Request", class: "btn small success accept_merge_request" | ||
| 18 | - - unless @project.root_ref? @merge_request.source_branch | 17 | + = f.submit "Accept Merge Request", class: "btn success accept_merge_request" |
| 18 | + - unless @project.root_ref? @merge_request.source_branch | ||
| 19 | .remove_branch_holder | 19 | .remove_branch_holder |
| 20 | - = label_tag :should_remove_source_branch, class: "checkbox" do | 20 | + = label_tag :should_remove_source_branch, class: "checkbox" do |
| 21 | = check_box_tag :should_remove_source_branch | 21 | = check_box_tag :should_remove_source_branch |
| 22 | Remove source-branch | 22 | Remove source-branch |
| 23 | .clearfix | 23 | .clearfix |
| 24 | - | 24 | + |
| 25 | 25 | ||
| 26 | .automerge_widget.cannot_be_merged{style: "display:none"} | 26 | .automerge_widget.cannot_be_merged{style: "display:none"} |
| 27 | .alert.alert-info | 27 | .alert.alert-info |