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

[rails.git] / db / migrate / 033_change_diary_entries_language.rb

diff --git a/db/migrate/033_change_diary_entries_language.rb b/db/migrate/033_change_diary_entries_language.rb
index 2ca844884610b1902651f2cac2233987797be644..6c3ae7de27165eec0d3181abc74e17095bf7cc58 100644 (file)
--- a/db/migrate/033_change_diary_entries_language.rb
+++ b/db/migrate/033_change_diary_entries_language.rb
@@ -1,7 +1,7 @@
-class ChangeDiaryEntriesLanguage < ActiveRecord::Migration
+class ChangeDiaryEntriesLanguage < ActiveRecord::Migration[4.2]
   def self.up
     remove_column "diary_entries", "language"
-    add_column "diary_entries", "language_code", :string
+    add_column "diary_entries", "language_code", :string, :null => false, :default => "en"
   end
 
   def self.down