summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-12-29 11:54:13 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-12-29 11:54:13 +0000
commit10491c38b0391408ec44140e3e449b0965230cc9 (patch)
tree4d408c8d0d3a4b8c326ec6cab7960916dd189e3d
parent58bc4b72d519d971be7c3eb80f174d9e22f2a1b2 (diff)
parent41c74cec09af146ed7fdb4778dd72fe578eb1407 (diff)
downloadgitlab-ce-10491c38b0391408ec44140e3e449b0965230cc9.tar.gz
Merge branch 'issue_3780' into 'master'
Downcased user or email search for avatar_icon. GitLab users are defined with their mail address which is enforced to be lower case. When a commit is listed in the history whose committer mail address is not written in all lower case, the corresponding GitLab user won't be found because the search is case sensitive resp. the mail address to search for not downcased. Closes #3780 See merge request !2234
-rw-r--r--app/helpers/application_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 0b00b9a0702..f7f7a1a02d3 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -72,7 +72,7 @@ module ApplicationHelper
if user_or_email.is_a?(User)
user = user_or_email
else
- user = User.find_by(email: user_or_email)
+ user = User.find_by(email: user_or_email.downcase)
end
if user