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

app/views/projects/merge_requests/_show.html.haml

@@ -42,7 +42,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)
-      .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
         = succeed '.' do
           = link_to "command line", "#modal_merge_info", class: "how_to_merge_link vlink", title: "How To Merge", "data-toggle" => "modal"

changelogs/unreleased/additional-award-emoji-repositioning-fixes.yml

+---
+title: Removed bottom padding from merge manually from CLI because of repositioning award emoji's
+merge_request:
+author: