diff options
| author | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-11-23 16:39:29 -0600 |
|---|---|---|
| committer | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-12-18 16:13:35 -0600 |
| commit | 49bc458ad792a095c5ab5ebfc6b3cdf2f655bb92 (patch) | |
| tree | 6b148b03b081853c15a4a721d6e30021514bd0ed /app/assets/javascripts/monitoring | |
| parent | 2ba30096d26174f22851feb8d35f287b8db772e3 (diff) | |
| download | gitlab-ce-49bc458ad792a095c5ab5ebfc6b3cdf2f655bb92.tar.gz | |
optimized d3 v4 with a custom made bundle
Diffstat (limited to 'app/assets/javascripts/monitoring')
3 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/javascripts/monitoring/components/graph.vue b/app/assets/javascripts/monitoring/components/graph.vue index 3e2c40a2546..b767c6957a6 100644 --- a/app/assets/javascripts/monitoring/components/graph.vue +++ b/app/assets/javascripts/monitoring/components/graph.vue @@ -7,7 +7,7 @@ max as d3Max, extent as d3Extent, select as d3Select, - } from 'd3'; + } from '../../common_d3/index'; import GraphLegend from './graph/legend.vue'; import GraphFlag from './graph/flag.vue'; import GraphDeployment from './graph/deployment.vue'; diff --git a/app/assets/javascripts/monitoring/utils/date_time_formatters.js b/app/assets/javascripts/monitoring/utils/date_time_formatters.js index 111b5f3b6f1..66f826a0e12 100644 --- a/app/assets/javascripts/monitoring/utils/date_time_formatters.js +++ b/app/assets/javascripts/monitoring/utils/date_time_formatters.js @@ -1,6 +1,6 @@ import { timeFormat as d3TimeFormat, - bisector } from 'd3'; + bisector } from '../../common_d3/index'; export const dateFormat = d3TimeFormat('%b %-d, %Y'); export const timeFormat = d3TimeFormat('%-I:%M%p'); diff --git a/app/assets/javascripts/monitoring/utils/multiple_time_series.js b/app/assets/javascripts/monitoring/utils/multiple_time_series.js index ab0e8d5f366..5161a0ffe67 100644 --- a/app/assets/javascripts/monitoring/utils/multiple_time_series.js +++ b/app/assets/javascripts/monitoring/utils/multiple_time_series.js @@ -1,3 +1,4 @@ +import _ from 'underscore'; import { scaleLinear as d3ScaleLinear, scaleTime as d3ScaleTime, @@ -7,8 +8,7 @@ import { max as d3Max, timeMinute as d3TimeMinute, curveLinear as d3CurveLinear, -} from 'd3'; -import _ from 'underscore'; +} from '../../common_d3/index'; const defaultColorPalette = { blue: ['#1f78d1', '#8fbce8'], |