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

[rails.git] / db / migrate / 032_add_user_locale.rb

diff --git a/db/migrate/032_add_user_locale.rb b/db/migrate/032_add_user_locale.rb
index 4d00fc1a1e4bee94c63811e9bcb818c152749cac..54c2eb2585d342050060e256a7d8aaa02b3b12bc 100644 (file)
--- a/db/migrate/032_add_user_locale.rb
+++ b/db/migrate/032_add_user_locale.rb
@@ -1,6 +1,6 @@
-class AddUserLocale < ActiveRecord::Migration
+class AddUserLocale < ActiveRecord::Migration[4.2]
   def self.up
-    add_column "users", "locale", :string, :default => "en", :null => false
+    add_column "users", "locale", :string
   end
 
   def self.down