summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/pages/users/activity_calendar.js
diff options
context:
space:
mode:
authorTim Zallmann <tzallmann@gitlab.com>2018-07-02 07:46:40 +0000
committerPhil Hughes <me@iamphill.com>2018-07-02 07:46:40 +0000
commit0cad96c668263cd6f75f9fc2792d25338f0e9177 (patch)
tree877b3b26dc7f64f950029d3e2408d07813a22657 /app/assets/javascripts/pages/users/activity_calendar.js
parent765c4d9459c274beccf5d24396d3427b517dfa11 (diff)
downloadgitlab-ce-0cad96c668263cd6f75f9fc2792d25338f0e9177.tar.gz
Replaces date.format.js in vendor with NPM package
Diffstat (limited to 'app/assets/javascripts/pages/users/activity_calendar.js')
-rw-r--r--app/assets/javascripts/pages/users/activity_calendar.js5
1 files changed, 3 insertions, 2 deletions
diff --git a/app/assets/javascripts/pages/users/activity_calendar.js b/app/assets/javascripts/pages/users/activity_calendar.js
index 50d042fef29..9892a039941 100644
--- a/app/assets/javascripts/pages/users/activity_calendar.js
+++ b/app/assets/javascripts/pages/users/activity_calendar.js
@@ -2,6 +2,7 @@ import $ from 'jquery';
import _ from 'underscore';
import { scaleLinear, scaleThreshold } from 'd3-scale';
import { select } from 'd3-selection';
+import dateFormat from 'dateformat';
import { getDayName, getDayDifference } from '~/lib/utils/datetime_utility';
import axios from '~/lib/utils/axios_utils';
import flash from '~/flash';
@@ -26,7 +27,7 @@ function getSystemDate(systemUtcOffsetSeconds) {
function formatTooltipText({ date, count }) {
const dateObject = new Date(date);
const dateDayName = getDayName(dateObject);
- const dateText = dateObject.format('mmm d, yyyy');
+ const dateText = dateFormat(dateObject, 'mmm d, yyyy');
let contribText = 'No contributions';
if (count > 0) {
@@ -84,7 +85,7 @@ export default class ActivityCalendar {
date.setDate(date.getDate() + i);
const day = date.getDay();
- const count = timestamps[date.format('yyyy-mm-dd')] || 0;
+ const count = timestamps[dateFormat(date, 'yyyy-mm-dd')] || 0;
// Create a new group array if this is the first day of the week
// or if is first object