diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-28 09:09:01 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-28 09:09:01 +0000 |
commit | 67cdfd2683b89bce260600fa8925eefdcdf9e3e5 (patch) | |
tree | 5d01075e0ef7bc62bb27459f75d79ef138aec660 /app/assets/javascripts/pages/users | |
parent | ca2a7ed5bd43483f10fd74f46f31e32614889738 (diff) | |
download | gitlab-ce-67cdfd2683b89bce260600fa8925eefdcdf9e3e5.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/pages/users')
-rw-r--r-- | app/assets/javascripts/pages/users/activity_calendar.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/pages/users/activity_calendar.js b/app/assets/javascripts/pages/users/activity_calendar.js index 4f645e511f9..70e9333456d 100644 --- a/app/assets/javascripts/pages/users/activity_calendar.js +++ b/app/assets/javascripts/pages/users/activity_calendar.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import _ from 'underscore'; +import { last } from 'lodash'; import { scaleLinear, scaleThreshold } from 'd3-scale'; import { select } from 'd3-selection'; import dateFormat from 'dateformat'; @@ -164,11 +164,11 @@ export default class ActivityCalendar { .enter() .append('g') .attr('transform', (group, i) => { - _.each(group, (stamp, a) => { + group.forEach((stamp, a) => { if (a === 0 && stamp.day === this.firstDayOfWeek) { const month = stamp.date.getMonth(); const x = this.daySizeWithSpace * i + 1 + this.daySizeWithSpace; - const lastMonth = _.last(this.months); + const lastMonth = last(this.months); if ( lastMonth == null || (month !== lastMonth.month && x - this.daySizeWithSpace !== lastMonth.x) |