diff options
| author | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-07-28 12:24:12 -0500 |
|---|---|---|
| committer | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-08-30 18:28:12 -0500 |
| commit | d9a3c5f21c63cab57940b684ed99f2c6b5998b5e (patch) | |
| tree | efcac16e82c52389994a94a2d60c9045ae0eda0b /app/assets/javascripts/monitoring | |
| parent | fdd1d59f60d75a1488b1195eff7cdb9691578c52 (diff) | |
| download | gitlab-ce-d9a3c5f21c63cab57940b684ed99f2c6b5998b5e.tar.gz | |
Refactored deployment mixins
Diffstat (limited to 'app/assets/javascripts/monitoring')
| -rw-r--r-- | app/assets/javascripts/monitoring/components/graph.vue | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/monitoring/mixins/monitoring_mixins.js | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/app/assets/javascripts/monitoring/components/graph.vue b/app/assets/javascripts/monitoring/components/graph.vue index e577ded0423..049240963fe 100644 --- a/app/assets/javascripts/monitoring/components/graph.vue +++ b/app/assets/javascripts/monitoring/components/graph.vue @@ -40,7 +40,6 @@ graphWidth: 600, graphHeightOffset: 120, margin: {}, - breakpointHandler: Breakpoints.get(), unitOfDisplay: '', areaColorRgb: '#8fbce8', lineColorRgb: '#1f78d1', 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({ |