From d74aa827c4cb9f327ab028497182341921e56fbf Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Mon, 26 Feb 2018 11:18:45 +0000
Subject: Add missing class to parent element and remove extra CSS

---
 .../projects/tree/components/commit_pipeline_status_component.vue | 2 +-
 app/assets/stylesheets/pages/commits.scss                         | 8 --------
 app/views/projects/commits/_commit.html.haml                      | 2 +-
 changelogs/unreleased/43315-gpg-popover.yml                       | 2 +-
 4 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/app/assets/javascripts/projects/tree/components/commit_pipeline_status_component.vue b/app/assets/javascripts/projects/tree/components/commit_pipeline_status_component.vue
index c53ce0549f5..63f20a0041d 100644
--- a/app/assets/javascripts/projects/tree/components/commit_pipeline_status_component.vue
+++ b/app/assets/javascripts/projects/tree/components/commit_pipeline_status_component.vue
@@ -98,7 +98,7 @@
   };
 </script>
 <template>
-  <div class="realtime-ci-status-wrapper">
+  <div>
     <loading-icon
       label="Loading pipeline status"
       size="3"
diff --git a/app/assets/stylesheets/pages/commits.scss b/app/assets/stylesheets/pages/commits.scss
index fa676abdc6c..8b680c2dc52 100644
--- a/app/assets/stylesheets/pages/commits.scss
+++ b/app/assets/stylesheets/pages/commits.scss
@@ -196,14 +196,6 @@
   @media (min-width: $screen-sm-min) {
     font-size: 0;
 
-    .realtime-ci-status-wrapper {
-      display: inline;
-
-      .ci-status-icon {
-        font-size: 6px;
-      }
-    }
-
     .fa-spinner {
       font-size: 12px;
     }
diff --git a/app/views/projects/commits/_commit.html.haml b/app/views/projects/commits/_commit.html.haml
index 6ff7bcae54f..078bd0eee63 100644
--- a/app/views/projects/commits/_commit.html.haml
+++ b/app/views/projects/commits/_commit.html.haml
@@ -20,7 +20,7 @@
     .avatar-cell.hidden-xs
       = author_avatar(commit, size: 36)
 
-    .commit-detail
+    .commit-detail.flex-list
       .commit-content
         = link_to_markdown_field(commit, :title, link, class: "commit-row-message item-title")
         %span.commit-row-message.visible-xs-inline
diff --git a/changelogs/unreleased/43315-gpg-popover.yml b/changelogs/unreleased/43315-gpg-popover.yml
index 4b2d197c627..69238aa8075 100644
--- a/changelogs/unreleased/43315-gpg-popover.yml
+++ b/changelogs/unreleased/43315-gpg-popover.yml
@@ -1,5 +1,5 @@
 ---
 title: Fixes gpg popover layout
-merge_request:
+merge_request: 17323
 author:
 type: fixed
-- 
cgit v1.2.1