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 5957b13bac5d16448fe9fbf6d09dcef74362fb7e..b10fcf144ea8ff7285423f2d99a6f63eda199b3b 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,9 @@
 require "migrate"
 
-class AlterUserRolesAndBlocks < ActiveRecord::Migration
+class AlterUserRolesAndBlocks < ActiveRecord::Migration[4.2]
+  class UserRole < ApplicationRecord
+  end
+
   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