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

[rails.git] / app / models / user_role.rb

diff --git a/app/models/user_role.rb b/app/models/user_role.rb
index f3d48cade4bcfeb53df717b509cc0ab90ac45d39..a081361a76cb6db41fe03737c313db6fc08ddc45 100644 (file)
--- a/app/models/user_role.rb
+++ b/app/models/user_role.rb
@@ -19,7 +19,7 @@
 #  user_roles_user_id_fkey     (user_id => users.id)
 #
 
-class UserRole < ActiveRecord::Base
+class UserRole < ApplicationRecord
   belongs_to :user
   belongs_to :granter, :class_name => "User"