app/views/users/_activity_log.html.erb in sufia-6.7.0 vs app/views/users/_activity_log.html.erb in sufia-7.0.0.beta1

- old
+ new

@@ -1,6 +1,6 @@ -<table id="activity" class="table table-zebra-striped table-bordered"> +<table id="activity" class="table table-striped table-bordered"> <caption class="sr-only">Activity of users you follow</caption> <thead> <tr> <th>User Activity</th> <th>Date</th> @@ -9,10 +9,10 @@ <tbody> <% events.each do |event| %> <% next if event[:action].blank? or event[:timestamp].blank? %> <tr> <td><%= event[:action].html_safe %></td> - <td><%= time_ago_in_words(Time.at(event[:timestamp].to_i)) %> ago</td> + <td><%= time_ago_in_words(Time.zone.at(event[:timestamp].to_i)) %> ago</td> </tr> <% end %> </tbody> </table>