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

[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 864f0db5de95dc168611b3a451f1d4d9e37d0e42..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'
+require "migrate"
+
+class AlterUserRolesAndBlocks < ActiveRecord::Migration[4.2]
+  class UserRole < ApplicationRecord
+  end

 
 

-class AlterUserRolesAndBlocks < ActiveRecord::Migration

   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
   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