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

[rails.git] / db / migrate / 20120214210114_add_text_format.rb

diff --git a/db/migrate/20120214210114_add_text_format.rb b/db/migrate/20120214210114_add_text_format.rb
index 165524d2cc501074c8679ba93e4493b743fb672f..6ec84ce44988f61b55700eb144428d4ccd156fb7 100644 (file)
--- a/db/migrate/20120214210114_add_text_format.rb
+++ b/db/migrate/20120214210114_add_text_format.rb
@@ -1,6 +1,6 @@
 require "migrate"
 
-class AddTextFormat < ActiveRecord::Migration
+class AddTextFormat < ActiveRecord::Migration[4.2]
   def up
     create_enumeration :format_enum, %w[html markdown text]
     add_column :users, :description_format, :format_enum, :null => false, :default => "html"