From 8ddb064bbd3ef80700c6dd2131cad6f7e81c96e8 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Wed, 20 Nov 2013 11:19:51 +0200 Subject: [PATCH] Prefer user email match when looking for commit author Signed-off-by: Dmitriy Zaporozhets --- app/helpers/commits_helper.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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", -- 2.11.0