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

[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 8e6853188fa5b5f71990d845dc984d8ce0edf3f2..be8089a746f52d0b2bbbb667b46c27e2bd60da82 100644 (file)
--- a/db/migrate/20120214210114_add_text_format.rb
+++ b/db/migrate/20120214210114_add_text_format.rb
@@ -1,6 +1,4 @@
-require "migrate"
-
-class AddTextFormat < ActiveRecord::Migration[5.0]
+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"