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

[rails.git] / db / migrate / 046_alter_user_roles_and_blocks.rb

diff --git a/db/migrate/046_alter_user_roles_and_blocks.rb b/db/migrate/046_alter_user_roles_and_blocks.rb
index cbd95018d97765100d758697d6023552fc024ce5..c1d3cd9874c8ef777072ba03dc6204a4ce9df0cb 100644 (file)
--- a/db/migrate/046_alter_user_roles_and_blocks.rb
+++ b/db/migrate/046_alter_user_roles_and_blocks.rb
@@ -1,7 +1,5 @@
-require "migrate"
-
 class AlterUserRolesAndBlocks < ActiveRecord::Migration[4.2]
-  class UserRole < ActiveRecord::Base
+  class UserRole < ApplicationRecord
   end
 
   def self.up