diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-11-20 11:19:51 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-11-20 11:19:51 +0200 |
| commit | 8ddb064bbd3ef80700c6dd2131cad6f7e81c96e8 (patch) | |
| tree | 51eab23b5eb70a5d256cbedcd9a1aaef272986d4 | |
| parent | 893153113d5cc8b36314edac1e2454a8c6dd98e3 (diff) | |
| download | gitlab-ce-8ddb064bbd3ef80700c6dd2131cad6f7e81c96e8.tar.gz | |
Prefer user email match when looking for commit author
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| -rw-r--r-- | app/helpers/commits_helper.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/helpers/commits_helper.rb b/app/helpers/commits_helper.rb index c340eb30be1..0eca1295324 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", |