Merge branch 'ce-to-ee-2018-08-30' into 'master'

CE upstream - 2018-08-30 00:21 UTC

See merge request gitlab-org/gitlab-ee!7061

app/assets/stylesheets/framework/emojis.scss

@@ -3,6 +3,6 @@ gl-emoji {
   display: inline-flex;
   vertical-align: middle;
   font-family: "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
-  font-size: 1.5em;
-  line-height: 0.9;
+  font-size: 1.4em;
+  line-height: 1em;
 }

app/assets/stylesheets/pages/notes.scss

@@ -141,6 +141,9 @@ ul.notes {
     }
 
     .note-body {
+      overflow-x: auto;
+      overflow-y: hidden;
+
       .note-text {
         @include md-typography;
         // Reset ul style types since we're nested inside a ul already

changelogs/unreleased/fix_emojis_cutting_and_regressions.yml

+---
+title: Fix Emojis cutting in the right way
+merge_request:
+author: Alexander Popov
+type: fixed