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

[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 6ec84ce44988f61b55700eb144428d4ccd156fb7..2fcb77d46482cd19d6079594949353e8a62d8a7a 100644 (file)
--- a/db/migrate/20120214210114_add_text_format.rb
+++ b/db/migrate/20120214210114_add_text_format.rb
@@ -1,8 +1,6 @@
-require "migrate"
-

 class AddTextFormat < ActiveRecord::Migration[4.2]
   def up
 class AddTextFormat < ActiveRecord::Migration[4.2]
   def up

-    create_enumeration :format_enum, %w[html markdown text]
+    create_enum :format_enum, %w[html markdown text]

     add_column :users, :description_format, :format_enum, :null => false, :default => "html"
     add_column :user_blocks, :reason_format, :format_enum, :null => false, :default => "html"
     add_column :diary_entries, :body_format, :format_enum, :null => false, :default => "html"
     add_column :users, :description_format, :format_enum, :null => false, :default => "html"
     add_column :user_blocks, :reason_format, :format_enum, :null => false, :default => "html"
     add_column :diary_entries, :body_format, :format_enum, :null => false, :default => "html"