diff options
| author | Mike Greiling <mike@pixelcog.com> | 2018-03-13 18:00:35 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2018-03-13 18:00:35 +0000 |
| commit | 3bd219a45404a361a4e71ed1aea571bafe099b58 (patch) | |
| tree | 7ec33b46d9dabd17828eddee0c3e9dfcbcd5ba6d | |
| parent | 654050da694950593ecb08c632a695d464b4ab21 (diff) | |
| parent | f2247c65eecf6fc63ddeea83647e19422a5d6082 (diff) | |
| download | gitlab-ce-3bd219a45404a361a4e71ed1aea571bafe099b58.tar.gz | |
Merge branch 'jivl-fix-timescale-prometheus-charts-overlapping' into 'master'
fix timescale prometheus charts overlapping
Closes #43458
See merge request gitlab-org/gitlab-ce!17657
| -rw-r--r-- | app/assets/javascripts/monitoring/components/graph.vue | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/assets/javascripts/monitoring/components/graph.vue b/app/assets/javascripts/monitoring/components/graph.vue index 9e67a6f2146..42615d2bb8e 100644 --- a/app/assets/javascripts/monitoring/components/graph.vue +++ b/app/assets/javascripts/monitoring/components/graph.vue @@ -209,6 +209,7 @@ const xAxis = d3.axisBottom() .scale(axisXScale) + .ticks(this.graphWidth / 120) .tickFormat(timeScaleFormat); const yAxis = d3.axisLeft() |