diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-11-19 15:46:04 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-11-19 15:46:04 +0100 |
| commit | f5a630111fb1499a1541e77040529f74ca6475ec (patch) | |
| tree | c3c82cd23d7bdcbfe4ec38d12be4572a6e8653ee /app/assets/javascripts/stat_graph_contributors_util.js.coffee | |
| parent | 28af56dea5a88ffcaceb082cf67c9c1ab021609d (diff) | |
| parent | c8074b6b115c95c68d5f7df300a391b4eab521d5 (diff) | |
| download | gitlab-ce-f5a630111fb1499a1541e77040529f74ca6475ec.tar.gz | |
Merge branch 'master' into reference-pipeline-and-caching
Diffstat (limited to 'app/assets/javascripts/stat_graph_contributors_util.js.coffee')
| -rw-r--r-- | app/assets/javascripts/stat_graph_contributors_util.js.coffee | 5 |
1 files changed, 2 insertions, 3 deletions
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 |