diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2015-11-17 13:48:28 -0500 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2015-11-17 13:49:48 -0500 |
| commit | 17a0cd46ccdad003b3bf36061fb16caa24a977a1 (patch) | |
| tree | 242173e773cc277bbe71cf04d6de8b4e18b8703a | |
| parent | c9f032470116e0cda23e605a66eceaad928b3e02 (diff) | |
| download | gitlab-ce-17a0cd46ccdad003b3bf36061fb16caa24a977a1.tar.gz | |
Merge branch 'contributor-graph-by-email' into 'master'
See merge request !1705
| -rw-r--r-- | CHANGELOG | 4 | ||||
| -rw-r--r-- | app/assets/javascripts/stat_graph_contributors_util.js.coffee | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/CHANGELOG b/CHANGELOG index 8e31d2a0432..56072e10eff 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -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
\ No newline at end of file diff --git a/app/assets/javascripts/stat_graph_contributors_util.js.coffee b/app/assets/javascripts/stat_graph_contributors_util.js.coffee index cfe5508290f..f5584bcfe4b 100644 --- a/app/assets/javascripts/stat_graph_contributors_util.js.coffee +++ b/app/assets/javascripts/stat_graph_contributors_util.js.coffee @@ -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
\ No newline at end of file |