Merge branch 'hash-block-return' into 'master'

Fix bug where a push would only create cross references from the first commit. Apparently we can't `return` from a `Hash.new` block. Who knew. See merge request !1638

Merge branch 'hash-block-return' into 'master'
5292b09f · Robert Speicher · b9a149bc · cc2b05ad · 5292b09f · 5292b09f
Commit 5292b09f authored Oct 19, 2015 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

git_push_service.rb app/services/git_push_service.rb +1 -1

reference_extractor.rb lib/gitlab/reference_extractor.rb +1 -1

No files found.
--- a/app/services/git_push_service.rb
+++ b/app/services/git_push_service.rb
@@ -79,7 +79,7 @@ class GitPushService

    authors = Hash.new do |hash, commit|
      email = commit.author_email
-      return hash[email] if hash.has_key?(email)
+      next hash[email] if hash.has_key?(email)

      hash[email] = commit_user(commit)
    end

--- a/lib/gitlab/reference_extractor.rb
+++ b/lib/gitlab/reference_extractor.rb
@@ -27,7 +27,7 @@ module Gitlab
    def references
      @references ||= Hash.new do |references, type|
        type = type.to_sym
-        return references[type] if references.has_key?(type)
+        next references[type] if references.has_key?(type)

        references[type] = pipeline_result(type)
      end