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

[rails.git] / db / migrate / 20120404205604_add_user_and_description_to_redaction.rb

diff --git a/db/migrate/20120404205604_add_user_and_description_to_redaction.rb b/db/migrate/20120404205604_add_user_and_description_to_redaction.rb
index 5de170ca71b2cef42980135833e751c8e7b7c2b7..56ef052533239da7bbd05b13f8d95da41126fc02 100644 (file)
--- a/db/migrate/20120404205604_add_user_and_description_to_redaction.rb
+++ b/db/migrate/20120404205604_add_user_and_description_to_redaction.rb
@@ -1,6 +1,4 @@
-require "migrate"
-
-class AddUserAndDescriptionToRedaction < ActiveRecord::Migration
+class AddUserAndDescriptionToRedaction < ActiveRecord::Migration[4.2]

   def change
     add_column :redactions, :user_id, :bigint, :null => false
     add_column :redactions, :description_format, :format_enum, :null => false, :default => "markdown"
   def change
     add_column :redactions, :user_id, :bigint, :null => false
     add_column :redactions, :description_format, :format_enum, :null => false, :default => "markdown"