Merge branch 'fix-missing-d3-import' into 'master'

Fix missing d3 timeWeek import in prometheus graph Closes #41644 See merge request gitlab-org/gitlab-ce!16216

Merge branch 'fix-missing-d3-import' into 'master'
5cd43c76 · Jacob Schatz · f7cbfe1d · e3f215f6 · 5cd43c76
Commit 5cd43c76 authored Jan 04, 2018 by Jacob Schatz
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 2 deletions

date_time_formatters.js ...sets/javascripts/monitoring/utils/date_time_formatters.js +12 -2

No files found.
--- a/app/assets/javascripts/monitoring/utils/date_time_formatters.js
+++ b/app/assets/javascripts/monitoring/utils/date_time_formatters.js
 import { timeFormat as time } from 'd3-time-format';
-import { timeSecond, timeMinute, timeHour, timeDay, timeMonth, timeYear } from 'd3-time';
+import { timeSecond, timeMinute, timeHour, timeDay, timeWeek, timeMonth, timeYear } from 'd3-time';
 import { bisector } from 'd3-array';

-const d3 = { time, bisector, timeSecond, timeMinute, timeHour, timeDay, timeMonth, timeYear };
+const d3 = {
+  time,
+  bisector,
+  timeSecond,
+  timeMinute,
+  timeHour,
+  timeDay,
+  timeWeek,
+  timeMonth,
+  timeYear,
+};

 export const dateFormat = d3.time('%b %-d, %Y');
 export const timeFormat = d3.time('%-I:%M%p');