summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2017-02-02 13:00:42 -0600
committerMike Greiling <mike@pixelcog.com>2017-02-02 13:00:42 -0600
commit36025b67d90633e2c64c182727424dd8dce1b03f (patch)
tree57c6aee19e7149de9dfa137ca4c497372ea76f82 /app/assets
parentbccd791d4d698b6011ecea781d0ebc7c9ec1ddf8 (diff)
downloadgitlab-ce-36025b67d90633e2c64c182727424dd8dce1b03f.tar.gz
fix broken reference to formatDate in a CommonJS environment
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/javascripts/users/calendar.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/users/calendar.js b/app/assets/javascripts/users/calendar.js
index e7280d643d3..e0e40ad3adb 100644
--- a/app/assets/javascripts/users/calendar.js
+++ b/app/assets/javascripts/users/calendar.js
@@ -33,7 +33,7 @@
date.setDate(date.getDate() + i);
var day = date.getDay();
- var count = timestamps[dateFormat(date, 'yyyy-mm-dd')];
+ var count = timestamps[date.format('yyyy-mm-dd')];
// Create a new group array if this is the first day of the week
// or if is first object
@@ -122,7 +122,7 @@
if (stamp.count > 0) {
contribText = stamp.count + " contribution" + (stamp.count > 1 ? 's' : '');
}
- dateText = dateFormat(date, 'mmm d, yyyy');
+ dateText = date.format('mmm d, yyyy');
return contribText + "<br />" + (gl.utils.getDayName(date)) + " " + dateText;
};
})(this)).attr('class', 'user-contrib-cell js-tooltip').attr('fill', (function(_this) {