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

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

diff --git a/app/models/message.rb b/app/models/message.rb
index 4e89cb2e1648dd709f3e99cd715ee8df22b99c44..e3a3ec921b62f25cdfa13713aabb2b2c2490f371 100644 (file)
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -24,8 +24,6 @@
 #  messages_to_user_id_fkey    (to_user_id => users.id)
 #
 
 #  messages_to_user_id_fkey    (to_user_id => users.id)
 #
 

-require "validators"
-

 class Message < ActiveRecord::Base
   belongs_to :sender, :class_name => "User", :foreign_key => :from_user_id
   belongs_to :recipient, :class_name => "User", :foreign_key => :to_user_id
 class Message < ActiveRecord::Base
   belongs_to :sender, :class_name => "User", :foreign_key => :from_user_id
   belongs_to :recipient, :class_name => "User", :foreign_key => :to_user_id