From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Wed, 20 Nov 2013 09:19:51 +0000 (+0200)
Subject: Prefer user email match when looking for commit author
X-Git-Tag: v6.3.0~15
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8ddb064bbd3ef80700c6dd2131cad6f7e81c96e8;p=wvm%2Fgitlab.git

Prefer user email match when looking for commit author

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---

diff --git a/app/helpers/commits_helper.rb b/app/helpers/commits_helper.rb
index c340eb30b..0eca12953 100644
--- a/app/helpers/commits_helper.rb
+++ b/app/helpers/commits_helper.rb
@@ -125,7 +125,9 @@ module CommitsHelper
             source_name
           end
 
-    user = User.where('name like ? or email like ?', source_name, source_email).first
+    # Prefer email match over name match
+    user = User.where(email: source_email).first
+    user ||= User.where(name: source_name).first
 
     options = {
       class: "commit-#{options[:source]}-link has_tooltip",