diff --git a/app/controllers/global_activities_controller.rb b/app/controllers/global_activities_controller.rb index 1ea1038c9..56eeca497 100644 --- a/app/controllers/global_activities_controller.rb +++ b/app/controllers/global_activities_controller.rb @@ -58,7 +58,7 @@ class GlobalActivitiesController < ApplicationController respond_to do |format| format.json do render json: { - activities_html: render_to_string(partial: 'activity_list'), + activities_html: render_to_string(partial: 'activity_list', formats: :html), next_page: @next_page, starting_timestamp: @starting_timestamp } diff --git a/app/views/shared/_atwho_user_container.erb b/app/views/shared/_atwho_user_container.erb index 71c85919e..83f9f1a53 100644 --- a/app/views/shared/_atwho_user_container.erb +++ b/app/views/shared/_atwho_user_container.erb @@ -21,14 +21,14 @@ data-full-name="<%= user.full_name %>" data-email="<%= user.email %>" data-popover-html="<%= popover_html %>" - data-user-avatar-popover-absolute-url="<%= user_avatar_popover_absolute_url %>" + data-user-avatar-popover-absolute-url="<%= user_avatar_absolute_url(user, :thumb, true) %>" > <% unless skip_avatar %> avatar + ref="<%= 'missing-img' unless user.avatar.attached? %>"> <% end %> <%= user.full_name %>