Merge remote-tracking branch 'openstreetmap/pull/1495'

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

diff --git a/app/models/user_role.rb b/app/models/user_role.rb
index 9686f7250bdc7234173dad784686811420422594..4f80f195279916daac70c8225386c47da0e73d80 100644 (file)
--- a/app/models/user_role.rb
+++ b/app/models/user_role.rb
@@ -1,7 +1,8 @@
 class UserRole < ActiveRecord::Base
   belongs_to :user
 class UserRole < ActiveRecord::Base
   belongs_to :user

+  belongs_to :granter, :class_name => "User"

 
 

-  ALL_ROLES = %w(administrator moderator)
+  ALL_ROLES = %w(administrator moderator).freeze

 
   validates :role, :inclusion => ALL_ROLES, :uniqueness => { :scope => :user_id }
 end
 
   validates :role, :inclusion => ALL_ROLES, :uniqueness => { :scope => :user_id }
 end