about summary refs log tree commit diff
path: root/app/models/mention.rb
diff options
context:
space:
mode:
authorJantsoP <jantso.porali@gmail.com>2017-04-05 10:07:17 +0200
committerGitHub <noreply@github.com>2017-04-05 10:07:17 +0200
commit20b53e6add351e5bb5ff1bd4d675db6252e03293 (patch)
treee252e354e63765d1f28919f2ac58de26001806cb /app/models/mention.rb
parent3ec221d3b7093e2a2606ec04036cca9e9f1f733d (diff)
parentccb6a658fd1a2e596c95d5b8e7a39f72a5f5b14b (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