Merge branch 'fix-emoji-alignment' into 'master'

Fix inline emoji text alignment

## What does this MR do?
Changes the vertical alignment of inline emoji text from `middle` to `top`

## Are there points in the code the reviewer needs to double check?
Potential emoji side effects (I couldn't find any)

## Why was this MR needed?
Fixes UI inconsistency

## What are the relevant issue numbers?
Closes #21403 

## Screenshots (if relevant)
Before:
![Screen_Shot_2016-08-25_at_9.57.41_AM](/uploads/b7ce1da8d0eaaea3391502238a92fc77/Screen_Shot_2016-08-25_at_9.57.41_AM.png)

After:
![Screen_Shot_2016-08-25_at_9.57.49_AM](/uploads/8649c14764c3f616c487be115505c49a/Screen_Shot_2016-08-25_at_9.57.49_AM.png)

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
  - [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !6027

2 files changed, 2 insertions, 1 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 063ca6e145e..4da8845ad09 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -11,6 +11,7 @@ v 8.12.0 (unreleased)
   - Add Sentry logging to API calls
   - Automatically expand hidden discussions when accessed by a permalink !5585 (Mike Greiling)
   - Added tests for diff notes
+  - Fix inline emoji text alignment (ClemMakesApps)
   - Added 'only_allow_merge_if_build_succeeds' project setting in the API. !5930 (Duck)
   - Reduce number of database queries on builds tab
   - Use the default branch for displaying the project icon instead of master !5792 (Hannes Rosenögger)
diff --git a/app/assets/stylesheets/framework/common.scss b/app/assets/stylesheets/framework/common.scss
index c1e5305644b..8984bce616c 100644
--- a/app/assets/stylesheets/framework/common.scss
+++ b/app/assets/stylesheets/framework/common.scss
@@ -248,7 +248,7 @@ li.note {
 
 img.emoji {
   height: 20px;
-  vertical-align: middle;
+  vertical-align: top;
   width: 20px;
 }