diff options
author | Mike Greiling <mike@pixelcog.com> | 2016-10-28 03:22:02 -0500 |
---|---|---|
committer | Mike Greiling <mike@pixelcog.com> | 2017-01-06 10:21:02 -0600 |
commit | 55f291e8ceae6d3d432039f72f6935c62fb2a872 (patch) | |
tree | 0251e33d29241731ad16ae8a9681fa0863782840 /app/assets/javascripts/users | |
parent | 31bd36845ba1c18404f029f85b6a0f841c1c390c (diff) | |
download | gitlab-ce-55f291e8ceae6d3d432039f72f6935c62fb2a872.tar.gz |
replace application.js sprockets output with webpack-generated equivalent
Diffstat (limited to 'app/assets/javascripts/users')
-rw-r--r-- | app/assets/javascripts/users/calendar.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/users/calendar.js b/app/assets/javascripts/users/calendar.js index 578be7c3590..43ee6a9d9fd 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) { |