Prefer user email match when looking for commit author

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

Prefer user email match when looking for commit author
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets
1 parent 89315311
Showing 1 changed file with 3 additions and 1 deletions Show diff stats
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",
...	...	@@ -125,7 +125,9 @@ module CommitsHelper
125	125	source_name
126	126	end
127	127
128		- user = User.where('name like ? or email like ?', source_name, source_email).first
	128	+ # Prefer email match over name match
	129	+ user = User.where(email: source_email).first
	130	+ user \|\|= User.where(name: source_name).first
129	131
130	132	options = {
131	133	class: "commit-#{options[:source]}-link has_tooltip",
...	...