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

[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..b10fcf144ea8ff7285423f2d99a6f63eda199b3b 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,7 @@
 require "migrate"
 
 class AlterUserRolesAndBlocks < ActiveRecord::Migration[4.2]
 require "migrate"
 
 class AlterUserRolesAndBlocks < ActiveRecord::Migration[4.2]

-  class UserRole < ActiveRecord::Base
+  class UserRole < ApplicationRecord

   end
 
   def self.up
   end
 
   def self.up