Merge remote-tracking branch 'upstream/master' into routing

[rails.git] / db / migrate / 029_add_user_foreign_keys.rb

diff --git a/db/migrate/029_add_user_foreign_keys.rb b/db/migrate/029_add_user_foreign_keys.rb
index f965be77e5a35a5d68c75ec8a5571e682ecb639b..cb0d9e1dddc5fd0b4cb870f370e8b2942f61b6f0 100644 (file)
--- a/db/migrate/029_add_user_foreign_keys.rb
+++ b/db/migrate/029_add_user_foreign_keys.rb
@@ -1,4 +1,4 @@
-require 'lib/migrate'
+require 'migrate'
 
 class AddUserForeignKeys < ActiveRecord::Migration
   def self.up
@@ -15,6 +15,6 @@ class AddUserForeignKeys < ActiveRecord::Migration
   end
 
   def self.down
-    raise IrreversibleMigration.new
+    raise ActiveRecord::IrreversibleMigration
   end
 end