about summary refs log tree commit diff
path: root/app/models/mention.rb
diff options
context:
space:
mode:
authorAndré Lewin <andre.charles.lewin@gmail.com>2017-04-05 20:28:58 +0200
committerGitHub <noreply@github.com>2017-04-05 20:28:58 +0200
commitbf7cefa516075b480fd5da5ea4b1385d7d17bdd5 (patch)
tree45bc6b379f5d06553d0a3e5bf4c0e2b452b7552f /app/models/mention.rb
parent8736ef50ad13d5506bd6a673d4fcb96c33b609a3 (diff)
parentd13d169922c7efeb6e6c20ef6a271eeda552275f (diff)
Merge branch 'master' into master
Diffstat (limited to 'app/models/mention.rb')
-rw-r--r--app/models/mention.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/app/models/mention.rb b/app/models/mention.rb
index 10a9cb1cd..03e76fcc4 100644
--- a/app/models/mention.rb
+++ b/app/models/mention.rb
@@ -1,11 +1,10 @@
 # frozen_string_literal: true
 
 class Mention < ApplicationRecord
-  belongs_to :account, inverse_of: :mentions
-  belongs_to :status
+  belongs_to :account, inverse_of: :mentions, required: true
+  belongs_to :status, required: true
 
   has_one :notification, as: :activity, dependent: :destroy
 
-  validates :account, :status, presence: true
   validates :account, uniqueness: { scope: :status }
 end