diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-12-22 15:23:08 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-12-22 15:23:08 +0000 |
| commit | 66e7f126b4bdc8e17e56f53a2348d22888095d3c (patch) | |
| tree | 9df1e0f4316027c5c6619e0f13395d15be40b260 | |
| parent | 96822b6933e9af3f003e82c71d03bf5a49bd22ee (diff) | |
| parent | fab2f071abc80ee777fea6968147dfb735f2551c (diff) | |
| download | gitlab-ce-66e7f126b4bdc8e17e56f53a2348d22888095d3c.tar.gz | |
Merge branch '25961-spec-list-blank' into 'master'
Fix dropdown content non appearing in MR view
Closes #25961
See merge request !8255
| -rw-r--r-- | app/assets/javascripts/dispatcher.js.es6 | 5 | ||||
| -rw-r--r-- | app/assets/javascripts/merge_request_tabs.js.es6 | 4 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/pipelines.scss | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/25961-spec-list-blank.yml | 4 |
4 files changed, 12 insertions, 5 deletions
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: |