Add latest changes from gitlab-org/gitlab@master

3 files changed, 62 insertions, 2 deletions

diff --git a/app/assets/javascripts/lib/dateformat.js b/app/assets/javascripts/lib/dateformat.js
new file mode 100644
index 00000000000..1fd95dd03ab
--- /dev/null
+++ b/app/assets/javascripts/lib/dateformat.js
@@ -0,0 +1,60 @@
+import dateFormat, { i18n, masks } from 'dateformat';
+import { s__, __ } from '~/locale';
+
+i18n.dayNames = [
+  __('Sun'),
+  __('Mon'),
+  __('Tue'),
+  __('Wed'),
+  __('Thu'),
+  __('Fri'),
+  __('Sat'),
+  __('Sunday'),
+  __('Monday'),
+  __('Tuesday'),
+  __('Wednesday'),
+  __('Thursday'),
+  __('Friday'),
+  __('Saturday'),
+];
+
+i18n.monthNames = [
+  __('Jan'),
+  __('Feb'),
+  __('Mar'),
+  __('Apr'),
+  __('May'),
+  __('Jun'),
+  __('Jul'),
+  __('Aug'),
+  __('Sep'),
+  __('Oct'),
+  __('Nov'),
+  __('Dec'),
+  __('January'),
+  __('February'),
+  __('March'),
+  __('April'),
+  __('May'),
+  __('June'),
+  __('July'),
+  __('August'),
+  __('September'),
+  __('October'),
+  __('November'),
+  __('December'),
+];
+
+i18n.timeNames = [
+  s__('Time|a'),
+  s__('Time|p'),
+  s__('Time|am'),
+  s__('Time|pm'),
+  s__('Time|A'),
+  s__('Time|P'),
+  s__('Time|AM'),
+  s__('Time|PM'),
+];
+
+export { masks };
+export default dateFormat;
diff --git a/app/assets/javascripts/lib/utils/datetime/date_format_utility.js b/app/assets/javascripts/lib/utils/datetime/date_format_utility.js
index 830f4604382..d07abb72210 100644
--- a/app/assets/javascripts/lib/utils/datetime/date_format_utility.js
+++ b/app/assets/javascripts/lib/utils/datetime/date_format_utility.js
@@ -1,5 +1,5 @@
-import dateFormat from 'dateformat';
 import { isString, mapValues, reduce, isDate, unescape } from 'lodash';
+import dateFormat from '~/lib/dateformat';
 import { roundToNearestHalf } from '~/lib/utils/common_utils';
 import { sanitize } from '~/lib/dompurify';
 import { s__, n__, __, sprintf } from '~/locale';
diff --git a/app/assets/javascripts/lib/utils/datetime_range.js b/app/assets/javascripts/lib/utils/datetime_range.js
index 840cc4600fe..548f5a438df 100644
--- a/app/assets/javascripts/lib/utils/datetime_range.js
+++ b/app/assets/javascripts/lib/utils/datetime_range.js
@@ -1,5 +1,5 @@
-import dateformat from 'dateformat';
 import { pick, omit, isEqual, isEmpty } from 'lodash';
+import dateformat from '~/lib/dateformat';
 import { DATETIME_RANGE_TYPES } from './constants';
 import { secondsToMilliseconds } from './datetime_utility';