Add latest changes from gitlab-org/gitlab@master

3 files changed, 3 insertions, 3 deletions

diff --git a/app/assets/javascripts/analytics/shared/constants.js b/app/assets/javascripts/analytics/shared/constants.js
index e1bc59b36ef..dcdb8b83142 100644
--- a/app/assets/javascripts/analytics/shared/constants.js
+++ b/app/assets/javascripts/analytics/shared/constants.js
@@ -1,4 +1,4 @@
-import { masks } from 'dateformat';
+import { masks } from '~/lib/dateformat';
 import { s__ } from '~/locale';
 
 export const DATE_RANGE_LIMIT = 180;
diff --git a/app/assets/javascripts/analytics/shared/utils.js b/app/assets/javascripts/analytics/shared/utils.js
index 1887f2affc3..bc52e38fc81 100644
--- a/app/assets/javascripts/analytics/shared/utils.js
+++ b/app/assets/javascripts/analytics/shared/utils.js
@@ -1,5 +1,5 @@
-import dateFormat from 'dateformat';
 import { hideFlash } from '~/flash';
+import dateFormat from '~/lib/dateformat';
 import { slugify } from '~/lib/utils/text_utility';
 import { urlQueryToFilter } from '~/vue_shared/components/filtered_search_bar/filtered_search_utils';
 import { dateFormats } from './constants';
diff --git a/app/assets/javascripts/analytics/usage_trends/utils.js b/app/assets/javascripts/analytics/usage_trends/utils.js
index 91907877ed6..9474d264363 100644
--- a/app/assets/javascripts/analytics/usage_trends/utils.js
+++ b/app/assets/javascripts/analytics/usage_trends/utils.js
@@ -1,5 +1,5 @@
-import { masks } from 'dateformat';
 import { get } from 'lodash';
+import { masks } from '~/lib/dateformat';
 import { formatDate } from '~/lib/utils/datetime_utility';
 
 const { isoDate } = masks;