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

[rails.git] / db / migrate / 20161002153425_add_join_table_between_users_and_diary_entries.rb

diff --git a/db/migrate/20161002153425_add_join_table_between_users_and_diary_entries.rb b/db/migrate/20161002153425_add_join_table_between_users_and_diary_entries.rb
index cb8e455dd1c3feca9bfea642214609043aec0f63..4151d19a3043f54fb0972f1051536631b1e7fde6 100644 (file)
--- a/db/migrate/20161002153425_add_join_table_between_users_and_diary_entries.rb
+++ b/db/migrate/20161002153425_add_join_table_between_users_and_diary_entries.rb
@@ -1,6 +1,4 @@
-require "migrate"
-
-class AddJoinTableBetweenUsersAndDiaryEntries < ActiveRecord::Migration
+class AddJoinTableBetweenUsersAndDiaryEntries < ActiveRecord::Migration[4.2]
   def self.up
     create_table :diary_entry_subscriptions, :id => false do |t|
       t.column :user_id, :bigint, :null => false