Commit 4d253c35 authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray

Merge branch 'additional-award-emoji-repositioning-fixes' into 'master'

Removed bottom padding from merge manually from CLI because of repositioning award emoji's

See merge request !8398
parents 5136e72c 197ca6ba
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
= render "projects/merge_requests/widget/show.html.haml" = 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) - if @merge_request.source_branch_exists? && @merge_request.mergeable? && @merge_request.can_be_merged_by?(current_user)
.merge-manually.light.prepend-top-default.append-bottom-default .merge-manually.light.prepend-top-default
You can also accept this merge request manually using the You can also accept this merge request manually using the
= succeed '.' do = succeed '.' do
= link_to "command line", "#modal_merge_info", class: "how_to_merge_link vlink", title: "How To Merge", "data-toggle" => "modal" = link_to "command line", "#modal_merge_info", class: "how_to_merge_link vlink", title: "How To Merge", "data-toggle" => "modal"
......
---
title: Removed bottom padding from merge manually from CLI because of repositioning award emoji's
merge_request:
author:
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