Merge remote-tracking branch 'upstream/pull/5160'

[rails.git] / db / migrate / 035_change_user_locale.rb

diff --git a/db/migrate/035_change_user_locale.rb b/db/migrate/035_change_user_locale.rb
index 117e1cd0cec7b813e10a49c9c40c95ae1fc64135..d1315fa0669634ec2550017ac3bffb1d751e7a07 100644 (file)
--- a/db/migrate/035_change_user_locale.rb
+++ b/db/migrate/035_change_user_locale.rb
@@ -1,6 +1,4 @@
-require 'migrate'
-
-class ChangeUserLocale < ActiveRecord::Migration
+class ChangeUserLocale < ActiveRecord::Migration[4.2]

   def self.up
     remove_foreign_key :users, :column => :locale, :name => "users_locale_fkey"
 
   def self.up
     remove_foreign_key :users, :column => :locale, :name => "users_locale_fkey"