summaryrefslogtreecommitdiff
path: root/app/views/merge_requests
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-12-31 18:35:38 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-12-31 18:35:38 +0200
commit22ec3fa14cb87fec3655d2666783d439618890c5 (patch)
tree29ea92205722377afdc4dedb368dba48faa460e8 /app/views/merge_requests
parente5ff5c28694daee117f22ba3a8c21f38a5f14966 (diff)
downloadgitlab-ce-22ec3fa14cb87fec3655d2666783d439618890c5.tar.gz
Fix MR css for accept MR block
Diffstat (limited to 'app/views/merge_requests')
-rw-r--r--app/views/merge_requests/show/_mr_accept.html.haml12
1 files changed, 6 insertions, 6 deletions
diff --git a/app/views/merge_requests/show/_mr_accept.html.haml b/app/views/merge_requests/show/_mr_accept.html.haml
index f24228856ff..b7e68937131 100644
--- a/app/views/merge_requests/show/_mr_accept.html.haml
+++ b/app/views/merge_requests/show/_mr_accept.html.haml
@@ -9,19 +9,19 @@
%span
= form_for [:automerge, @project, @merge_request], remote: true, method: :get do |f|
%p
- You can accept this request automatically.
- If you still want to do it manually -
+ You can accept this request automatically.
+ If you still want to do it manually -
%strong= link_to "click here", "#", class: "how_to_merge_link vlink", title: "How To Merge"
for instructions
.accept_group
- = f.submit "Accept Merge Request", class: "btn small success accept_merge_request"
- - unless @project.root_ref? @merge_request.source_branch
+ = f.submit "Accept Merge Request", class: "btn success accept_merge_request"
+ - unless @project.root_ref? @merge_request.source_branch
.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
Remove source-branch
.clearfix
-
+
.automerge_widget.cannot_be_merged{style: "display:none"}
.alert.alert-info