Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

2015-09-11 17:17:33 +08:00 · 2015-09-11 17:17:33 +08:00 · 09f6a67577
parent d04fc37de1 42ddc0bf3c
commit 09f6a67577
1 changed files with 1 additions and 1 deletions
--- a/db/migrate/20150911064528_alter_user_activities.rb
+++ b/db/migrate/20150911064528_alter_user_activities.rb
@ -1,6 +1,6 @@
 class AlterUserActivities < ActiveRecord::Migration
  def up
-    UserActivity.each do |activity|
+    UserActivity.all.each do |activity|
      if activity.act_type == 'Message'
        if activity.act
          unless activity.act.parent_id.nil?