diff options
author | Fatih Acet <acetfatih@gmail.com> | 2016-12-22 15:23:08 +0000 |
---|---|---|
committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-12-23 10:55:00 -0200 |
commit | f063473849b92a450a5a9d756155c61feff7e634 (patch) | |
tree | 385b5dc6ce3cf96522db242762b02191b1e7e238 | |
parent | 1cf2619596e13d112098707daa66a6830d2f9820 (diff) | |
download | gitlab-ce-f063473849b92a450a5a9d756155c61feff7e634.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 bd4bd3313a1..e0b17869e9d 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: |