diff options
| author | Phil Hughes <me@iamphill.com> | 2017-07-04 11:06:42 +0300 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-07-04 11:06:42 +0300 |
| commit | f8973d76bd399a7c3638133bb75b2158faad7bf4 (patch) | |
| tree | 570d110a485dd6474b23ae9e60503ae02e267317 /app | |
| parent | b5b4054d5882782892d0a860c7e95db9a22bfdec (diff) | |
| parent | 2a829d0f530c1721271400c46cfc7f0387dc789a (diff) | |
Merge branch 'monitoring-dashboard-fix-y-label' into 'master'
Fixed the y_label not setting correctly for each graph on the monitoring dashboard
Closes #34599
See merge request !12613
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/monitoring/components/monitoring_column.vue | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/monitoring/components/monitoring_column.vue b/app/assets/javascripts/monitoring/components/monitoring_column.vue index 4f4792877ee..e933634643b 100644 --- a/app/assets/javascripts/monitoring/components/monitoring_column.vue +++ b/app/assets/javascripts/monitoring/components/monitoring_column.vue @@ -104,7 +104,7 @@ } this.data = query.result[0].values; this.unitOfDisplay = query.unit || 'N/A'; - this.yAxisLabel = this.columnData.y_axis || 'Values'; + this.yAxisLabel = this.columnData.y_label || 'Values'; this.legendTitle = query.legend || 'Average'; this.graphWidth = this.$refs.baseSvg.clientWidth - this.margin.left - this.margin.right; |