summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2016-12-09 16:14:54 +0000
committerFilipa Lacerda <filipa@gitlab.com>2016-12-12 12:44:46 +0000
commit94e0f402334af845bb44e92a3e2646780d633ce2 (patch)
tree25de42446dc942f5e9f031c3ca7eb96341b21d7e
parent401a2ec0b159b3c5f4de617768b9a0489a7cdde3 (diff)
downloadgitlab-ce-94e0f402334af845bb44e92a3e2646780d633ce2.tar.gz
Fix Pipeline graph disappeared from the builds tab in commits and merge request views
-rw-r--r--app/assets/javascripts/pipelines.js.es64
-rw-r--r--app/views/projects/commit/_pipeline.html.haml2
2 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/pipelines.js.es6 b/app/assets/javascripts/pipelines.js.es6
index fd1e320dc35..f09c6bb7def 100644
--- a/app/assets/javascripts/pipelines.js.es6
+++ b/app/assets/javascripts/pipelines.js.es6
@@ -14,8 +14,8 @@
}
addMarginToBuildColumns() {
- this.pipelineGraph = document.querySelector('.pipeline-graph');
- const secondChildBuildNodes = document.querySelector('.pipeline-graph').querySelectorAll('.build:nth-child(2)');
+ this.pipelineGraph = document.querySelector('.js-pipeline-graph');
+ const secondChildBuildNodes = document.querySelector('.js-pipeline-graph').querySelectorAll('.build:nth-child(2)');
for (const buildNodeIndex in secondChildBuildNodes) {
const buildNode = secondChildBuildNodes[buildNodeIndex];
const firstChildBuildNode = buildNode.previousElementSibling;
diff --git a/app/views/projects/commit/_pipeline.html.haml b/app/views/projects/commit/_pipeline.html.haml
index c7b5c1124b3..08d3443b3d0 100644
--- a/app/views/projects/commit/_pipeline.html.haml
+++ b/app/views/projects/commit/_pipeline.html.haml
@@ -24,7 +24,7 @@
in
= time_interval_in_words pipeline.duration
- .row-content-block.build-content.middle-block.hidden
+ .row-content-block.build-content.middle-block.js-pipeline-graph.hidden
= render "projects/pipelines/graph", pipeline: pipeline
- if pipeline.yaml_errors.present?