From fab2f071abc80ee777fea6968147dfb735f2551c Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Thu, 22 Dec 2016 12:17:28 +0000
Subject: Fix dropdown content non appearing in MR view

Add MR ID to Changelog entry
---
 app/assets/javascripts/dispatcher.js.es6         | 5 -----
 app/assets/javascripts/merge_request_tabs.js.es6 | 4 ++++
 app/assets/stylesheets/pages/pipelines.scss      | 4 ++++
 changelogs/unreleased/25961-spec-list-blank.yml  | 4 ++++
 4 files changed, 12 insertions(+), 5 deletions(-)
 create mode 100644 changelogs/unreleased/25961-spec-list-blank.yml

diff --git a/app/assets/javascripts/dispatcher.js.es6 b/app/assets/javascripts/dispatcher.js.es6
index 5245c5aa494..78f68a247a2 100644
--- a/app/assets/javascripts/dispatcher.js.es6
+++ b/app/assets/javascripts/dispatcher.js.es6
@@ -140,11 +140,6 @@
         case 'projects:merge_requests:commits':
           new MergedButtons();
           break;
-        case 'projects:merge_requests:pipelines':
-          new gl.MiniPipelineGraph({
-            container: '.js-pipeline-table',
-          });
-          break;
         case "projects:merge_requests:diffs":
           new gl.Diff();
           new ZenMode();
diff --git a/app/assets/javascripts/merge_request_tabs.js.es6 b/app/assets/javascripts/merge_request_tabs.js.es6
index 42015a02477..860e7e066a0 100644
--- a/app/assets/javascripts/merge_request_tabs.js.es6
+++ b/app/assets/javascripts/merge_request_tabs.js.es6
@@ -259,6 +259,10 @@
           gl.utils.localTimeAgo($('.js-timeago', '#pipelines'));
           this.pipelinesLoaded = true;
           this.scrollToElement('#pipelines');
+
+          new gl.MiniPipelineGraph({
+            container: '.js-pipeline-table',
+          });
         },
       });
     }
diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index 697887dcbe5..241bf02bafd 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -52,6 +52,10 @@
   }
 }
 
+.content-list.pipelines .table-holder {
+  min-height: 300px;
+}
+
 .pipeline-holder {
   width: 100%;
   overflow: auto;
diff --git a/changelogs/unreleased/25961-spec-list-blank.yml b/changelogs/unreleased/25961-spec-list-blank.yml
new file mode 100644
index 00000000000..835def027a7
--- /dev/null
+++ b/changelogs/unreleased/25961-spec-list-blank.yml
@@ -0,0 +1,4 @@
+---
+title: Fix Pipeline builds list blank on MR
+merge_request: 8255
+author:
-- 
cgit v1.2.1