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

[rails.git] / db / migrate / 20150110152606_change_default_formats.rb

diff --git a/db/migrate/20150110152606_change_default_formats.rb b/db/migrate/20150110152606_change_default_formats.rb
index 84bc2be400b0c1a6348294172b52feab55ee2eb8..33de9b9c32e288f9ce73e1908d5935545fafbbf2 100644 (file)
--- a/db/migrate/20150110152606_change_default_formats.rb
+++ b/db/migrate/20150110152606_change_default_formats.rb
@@ -1,4 +1,4 @@
-class ChangeDefaultFormats < ActiveRecord::Migration
+class ChangeDefaultFormats < ActiveRecord::Migration[4.2]
   def up
     change_column_default :diary_entries, :body_format, "markdown"
     change_column_default :diary_comments, :body_format, "markdown"