summaryrefslogtreecommitdiff
path: root/app/helpers/application_helper.rb
diff options
context:
space:
mode:
authorSteven Thonus <github@popl.nl>2013-10-06 20:13:56 +0200
committerSteven Thonus <github@popl.nl>2013-10-09 09:05:09 +0200
commit65cad57a35002a9fd168863ae8a4d7ca045fb938 (patch)
tree61227cc71fea23b8f75852cd92452e4f2fd47179 /app/helpers/application_helper.rb
parent358426d66164d720d793ea37bacb4fc331c30171 (diff)
downloadgitlab-ce-65cad57a35002a9fd168863ae8a4d7ca045fb938.tar.gz
avatar upload on profile page
Diffstat (limited to 'app/helpers/application_helper.rb')
-rw-r--r--app/helpers/application_helper.rb9
1 files changed, 9 insertions, 0 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 7e5c10fee05..254b7351d98 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -49,6 +49,15 @@ module ApplicationHelper
args.any? { |v| v.to_s.downcase == action_name }
end
+ def avatar_icon(user_email = '', size = nil)
+ user = User.find_by_email(user_email)
+ if user && user.avatar.present?
+ user.avatar.url
+ else
+ gravatar_icon(user_email, size)
+ end
+ end
+
def gravatar_icon(user_email = '', size = nil)
size = 40 if size.nil? || size <= 0