summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2015-10-19 09:16:20 +0000
committerRobert Speicher <rspeicher@gmail.com>2015-10-19 11:19:26 +0200
commit5707aaf3972c578423382d9bdd83dd0957273ea6 (patch)
tree7f93776e297a2dacc87f94314cc2211137513a74
parentcc0978df418c6506abbe01f6d429af8fa7a4e164 (diff)
downloadgitlab-ce-5707aaf3972c578423382d9bdd83dd0957273ea6.tar.gz
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
-rw-r--r--app/services/git_push_service.rb2
-rw-r--r--lib/gitlab/reference_extractor.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/services/git_push_service.rb b/app/services/git_push_service.rb
index e54044365b9..3de7bb9dcaa 100644
--- 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
diff --git a/lib/gitlab/reference_extractor.rb b/lib/gitlab/reference_extractor.rb
index 333bd059055..da8df8a3025 100644
--- 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