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

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

diff --git a/app/models/user_role.rb b/app/models/user_role.rb
index f3d48cade4bcfeb53df717b509cc0ab90ac45d39..d374b4084e08e8fef0385c74fdfba82393ddb473 100644 (file)
--- a/app/models/user_role.rb
+++ b/app/models/user_role.rb
@@ -3,11 +3,11 @@
 # Table name: user_roles
 #
 #  id         :integer          not null, primary key
-#  user_id    :bigint(8)        not null
-#  role       :enum             not null
+#  user_id    :bigint           not null
 #  created_at :datetime
 #  updated_at :datetime
-#  granter_id :bigint(8)        not null
+#  role       :enum             not null
+#  granter_id :bigint           not null
 #
 # Indexes
 #
@@ -19,11 +19,11 @@
 #  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"
 
-  ALL_ROLES = %w[administrator moderator].freeze
+  ALL_ROLES = %w[administrator moderator importer].freeze
 
   validates :role, :inclusion => ALL_ROLES, :uniqueness => { :scope => :user_id }
 end