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

[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 812572e23c2f4353b8576d048845f956a4c0c900..c1d3cd9874c8ef777072ba03dc6204a4ce9df0cb 100644 (file)
--- a/db/migrate/046_alter_user_roles_and_blocks.rb
+++ b/db/migrate/046_alter_user_roles_and_blocks.rb
@@ -1,6 +1,7 @@
-require "migrate"
+class AlterUserRolesAndBlocks < ActiveRecord::Migration[4.2]
+  class UserRole < ApplicationRecord
+  end
 
-class AlterUserRolesAndBlocks < ActiveRecord::Migration[5.0]
   def self.up
     # the initial granter IDs can be "self" - there are none of these
     # in the current live DB, but there may be some in people's own local