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

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

diff --git a/app/models/message.rb b/app/models/message.rb
index 4ab129e9184f6593012bacd98c3de504ca06662c..49c11e900898923beb558d78d8d2b6e35845a158 100644 (file)
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -24,12 +24,12 @@
 #  messages_to_user_id_fkey    (to_user_id => users.id)
 #
 
-class Message < ActiveRecord::Base
+class Message < ApplicationRecord
   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 :body, :sent_on, :presence => true
   validates :title, :body, :characters => true
 
   def self.from_mail(mail, from, to)