Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-06-28

app/assets/stylesheets/framework/awards.scss

@@ -104,6 +104,10 @@
     position: relative;
     top: 3px;
   }
+
+  > gl-emoji {
+    line-height: 1.5;
+  }
 }
 
 .award-menu-holder {

app/assets/stylesheets/framework/emojis.scss

@@ -4,4 +4,5 @@ gl-emoji {
   vertical-align: middle;
   font-family: "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
   font-size: 1.5em;
+  line-height: 0.9;
 }

changelogs/unreleased/fix-paragraph-line-height-for-emoji.yml

+---
+title: Fix paragraph line height for emoji
+merge_request: 20137
+author: George Tsiolis
+type: fixed