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

[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 674ae3d49a7486e0f09a275df8dd81b90bc32b6c..6c3ae7de27165eec0d3181abc74e17095bf7cc58 100644 (file)
--- a/db/migrate/033_change_diary_entries_language.rb
+++ b/db/migrate/033_change_diary_entries_language.rb
@@ -1,4 +1,4 @@
-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, :null => false, :default => "en"
   def self.up
     remove_column "diary_entries", "language"
     add_column "diary_entries", "language_code", :string, :null => false, :default => "en"