summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-06-15 18:51:15 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-06-15 18:51:15 +0300
commitc279f40bc4347f487c4ae3f401e3f8287a0161ca (patch)
tree5f300c3a0ed4b1f1af058d35c9d8884ba234de37
parent0ca7b3ba37765cba366b2ad1b48dd09c9b5ed9bd (diff)
downloadgitlab-ce-dz-fix-mr-widget-padding.tar.gz
Add bottom padding for merge request command line textdz-fix-mr-widget-padding
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-rw-r--r--app/views/projects/merge_requests/_show.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/merge_requests/_show.html.haml b/app/views/projects/merge_requests/_show.html.haml
index c4df8bd504f..01887f1002d 100644
--- a/app/views/projects/merge_requests/_show.html.haml
+++ b/app/views/projects/merge_requests/_show.html.haml
@@ -37,7 +37,7 @@
= render "projects/merge_requests/widget/show.html.haml"
- if @merge_request.source_branch_exists? && @merge_request.mergeable? && @merge_request.can_be_merged_by?(current_user)
- .light.prepend-top-default
+ .light.prepend-top-default.append-bottom-default
You can also accept this merge request manually using the
= succeed '.' do
= link_to "command line", "#modal_merge_info", class: "how_to_merge_link vlink", title: "How To Merge", "data-toggle" => "modal"