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

[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 32d188c8f117111ee69788beda9fbee4e91310ca..f23bd2ffc3a7b0252fb13078599c3c115623d769 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,6 @@
 require "migrate"
 
 require "migrate"
 

-class AddUserAndDescriptionToRedaction < ActiveRecord::Migration[5.0]
+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"