summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose Ivan Vargas <jvargas@gitlab.com>2017-07-28 12:24:12 -0500
committerJose Ivan Vargas <jvargas@gitlab.com>2017-07-28 12:24:12 -0500
commit9f144abde6f974cfd64f9302f00cad1e247232bc (patch)
tree61a4d0674ce5a36c26c43718b8eff7be03bd73a9
parentdbe10c570a6f7b0602f40ee2d8b1aceb941e992b (diff)
downloadgitlab-ce-additional-time-series-charts.tar.gz
Refactored deployment mixinsadditional-time-series-charts
-rw-r--r--app/assets/javascripts/monitoring/mixins/monitoring_mixins.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/monitoring/mixins/monitoring_mixins.js b/app/assets/javascripts/monitoring/mixins/monitoring_mixins.js
index 8e62fa63f13..345a0b37a76 100644
--- a/app/assets/javascripts/monitoring/mixins/monitoring_mixins.js
+++ b/app/assets/javascripts/monitoring/mixins/monitoring_mixins.js
@@ -21,9 +21,9 @@ const mixins = {
formatDeployments() {
this.reducedDeploymentData = this.deploymentData.reduce((deploymentDataArray, deployment) => {
const time = new Date(deployment.created_at);
- const xPos = Math.floor(this.xScale(time));
+ const xPos = Math.floor(this.timeSeries[0].timeSeriesScaleX(time));
- time.setSeconds(this.data[0].time.getSeconds());
+ time.setSeconds(this.timeSeries[0].values[0].time.getSeconds());
if (xPos >= 0) {
deploymentDataArray.push({