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 aff628e035901e685c18515902087db8e48a088d..e3a3ec921b62f25cdfa13713aabb2b2c2490f371 100644 (file)
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -24,14 +24,13 @@
 #  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
 
   validates :title, :presence => true, :utf8 => true, :length => 1..255
   validates :body, :sent_on, :sender, :recipient, :presence => true
+  validates :title, :body, :characters => true
 
   def self.from_mail(mail, from, to)
     if mail.multipart?