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

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

diff --git a/app/models/user_block.rb b/app/models/user_block.rb
index 9150bae7962b641c03e49ee7ddd888b0d57d4756..47ff9ff08abcb4359476f830da79fa714b2d344c 100644 (file)
--- a/app/models/user_block.rb
+++ b/app/models/user_block.rb
@@ -28,9 +28,9 @@ class UserBlock < ApplicationRecord
   validate :moderator_permissions
   validates :reason, :characters => true
 
   validate :moderator_permissions
   validates :reason, :characters => true
 

-  belongs_to :user, :class_name => "User", :foreign_key => :user_id
-  belongs_to :creator, :class_name => "User", :foreign_key => :creator_id
-  belongs_to :revoker, :class_name => "User", :foreign_key => :revoker_id
+  belongs_to :user, :class_name => "User"
+  belongs_to :creator, :class_name => "User"
+  belongs_to :revoker, :class_name => "User"

 
   PERIODS = Settings.user_block_periods
 
 
   PERIODS = Settings.user_block_periods