Merge branch 'contributor-graph-by-email' into 'master'
See merge request !1705
This commit is contained in:
commit
354f244059
|
@ -3,6 +3,8 @@ Please view this file on the master branch, on stable branches it's out of date.
|
|||
v 8.3.0 (unreleased)
|
||||
|
||||
v 8.2.0
|
||||
v 8.2.0 (unreleased)
|
||||
- Fix grouping of contributors by email in graph.
|
||||
- Remove CSS property preventing hard tabs from rendering in Chromium 45 (Stan Hu)
|
||||
- Fix Drone CI service template not saving properly (Stan Hu)
|
||||
- Fix avatars not showing in Atom feeds and project issues when Gravatar disabled (Stan Hu)
|
||||
|
@ -1955,4 +1957,4 @@ v 0.8.0
|
|||
- stability
|
||||
- security fixes
|
||||
- increased test coverage
|
||||
- email notification
|
||||
- email notification
|
|
@ -6,7 +6,7 @@ window.ContributorsStatGraphUtil =
|
|||
for entry in log
|
||||
@add_date(entry.date, total) unless total[entry.date]?
|
||||
|
||||
data = by_author[entry.author_name] #|| by_email[entry.author_email]
|
||||
data = by_author[entry.author_name] || by_email[entry.author_email]
|
||||
data ?= @add_author(entry, by_author, by_email)
|
||||
|
||||
@add_date(entry.date, data) unless data[entry.date]
|
||||
|
@ -95,5 +95,4 @@ window.ContributorsStatGraphUtil =
|
|||
if date_range is null || date_range[0] <= new Date(date) <= date_range[1]
|
||||
true
|
||||
else
|
||||
false
|
||||
|
||||
false
|
Loading…
Reference in New Issue