[refs #265] fixed user avatars

app/helpers/users_helper.rb

@@ -1,7 +1,12 @@
 # -*- encoding : utf-8 -*-
 module UsersHelper
+
+  def avatar_url_by_email(email, size = :small)
+    avatar_url(User.where(:email => email).first, size)
+  end
+
   def avatar_url(user, size = :small)
-    if user.avatar?
+    if user.try('avatar?')
       user.avatar.url(size)
     else
       gravatar_url(user.email, user.avatar.styles[size].geometry.split('x').first)

app/views/activity_feeds/partials/_git_new_push_notification.haml

@@ -1,7 +1,7 @@
 - if defined? user_email
   .top
     .image
-      = image_tag(gravatar_url(user_email, 30)) 
+      = image_tag(avatar_url_by_email(user_email, :small), :alt => 'avatar')
     .text
       %span.name
         = link_to user_name, user_path(user_id)

app/views/activity_feeds/partials/_issue_assign_notification.haml

@@ -1,6 +1,6 @@
 .top
   .image
-    = image_tag(gravatar_url(activity_feed.user.email, 30))
+    = image_tag(avatar_url_by_email(activity_feed.user.email, :small), :alt => 'avatar')
   .text
     %span.name
       = link_to activity_feed.user.uname, user_path(activity_feed.user.uname)

app/views/activity_feeds/partials/_new_comment_commit_notification.haml

@@ -1,6 +1,6 @@
 .top
   .image
-    = image_tag(gravatar_url(user_email, 30))
+    = image_tag(avatar_url_by_email(user_email, :small), :alt => 'avatar')
   .text
     %span.name
       = link_to user_name, user_path(user_id)

app/views/activity_feeds/partials/_new_comment_notification.haml

@@ -1,6 +1,6 @@
 .top
   .image
-    = image_tag(gravatar_url(user_email, 30))
+    = image_tag(avatar_url_by_email(user_email, :small), :alt => 'avatar')
   .text
     %span.name
       = link_to user_name, user_path(user_id)

app/views/activity_feeds/partials/_new_issue_notification.haml

@@ -1,6 +1,6 @@
 .top
   .image
-    = image_tag(gravatar_url(user_email, 30))
+    = image_tag(avatar_url_by_email(user_email, :small), :alt => 'avatar')
   .text
     %span.name
       = link_to user_name, user_path(user_id)

app/views/activity_feeds/partials/_new_user_notification.haml

@@ -1,6 +1,6 @@
 .top
   .image
-    = image_tag(gravatar_url(activity_feed.user.email, 30))
+    = image_tag(avatar_url_by_email(activity_feed.user.email, :small), :alt => 'avatar')
   .text
     %span.name
       = link_to activity_feed.user.uname, user_path(activity_feed.user.uname)

app/views/activity_feeds/partials/_wiki_new_commit_notification.haml

@@ -1,6 +1,6 @@
 .top
   .image
-    = image_tag(gravatar_url(user_email, 30))
+    = image_tag(avatar_url_by_email(user_email, :small), :alt => 'avatar')
   .text
     %span.name
       = link_to user_name, user_path(user_id)