Merge branch 'commit-graphs-by-email' into 'master'

Group project contributions by both name and email.

See https://twitter.com/Argorain/status/598751646143897600.

We now group by both name and email, so that "Douwe Maan - douwe@gitlab.com", "Douwe Maan - me@douwe.me" and "Douwe M. - me@douwe.me" are all combined into one graph.

Fixes internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2328.

See merge request !700

1 files changed, 5 insertions, 3 deletions

diff --git a/spec/javascripts/stat_graph_contributors_util_spec.js b/spec/javascripts/stat_graph_contributors_util_spec.js
index ee90892eb48..dbafe782b77 100644
--- a/spec/javascripts/stat_graph_contributors_util_spec.js
+++ b/spec/javascripts/stat_graph_contributors_util_spec.js
@@ -118,9 +118,11 @@ describe("ContributorsStatGraphUtil", function () {
   describe("#add_author", function () {
     it("adds an author field to the collection", function () {
       var fake_author = { author_name: "Author", author_email: 'fake@email.com' }
-      var fake_collection = {}
-      ContributorsStatGraphUtil.add_author(fake_author, fake_collection)
-      expect(fake_collection[fake_author.author_name].author_name).toEqual("Author")
+      var fake_author_collection = {}
+      var fake_email_collection = {}
+      ContributorsStatGraphUtil.add_author(fake_author, fake_author_collection, fake_email_collection)
+      expect(fake_author_collection[fake_author.author_name].author_name).toEqual("Author")
+      expect(fake_email_collection[fake_author.author_email].author_name).toEqual("Author")
     })
   })