diff options
| author | JantsoP <jantso.porali@gmail.com> | 2017-04-05 10:07:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-05 10:07:17 +0200 |
| commit | 20b53e6add351e5bb5ff1bd4d675db6252e03293 (patch) | |
| tree | e252e354e63765d1f28919f2ac58de26001806cb /app/models | |
| parent | 3ec221d3b7093e2a2606ec04036cca9e9f1f733d (diff) | |
| parent | ccb6a658fd1a2e596c95d5b8e7a39f72a5f5b14b (diff) | |
Merge branch 'master' into master
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/block.rb | 5 | ||||
| -rw-r--r-- | app/models/follow.rb | 9 | ||||
| -rw-r--r-- | app/models/follow_request.rb | 5 | ||||
| -rw-r--r-- | app/models/mention.rb | 5 |
4 files changed, 12 insertions, 12 deletions
diff --git a/app/models/block.rb b/app/models/block.rb index 9c55703c9..ae456a6b6 100644 --- a/app/models/block.rb +++ b/app/models/block.rb @@ -3,9 +3,8 @@ class Block < ApplicationRecord include Paginable - belongs_to :account - belongs_to :target_account, class_name: 'Account' + belongs_to :account, required: true + belongs_to :target_account, class_name: 'Account', required: true - validates :account, :target_account, presence: true validates :account_id, uniqueness: { scope: :target_account_id } end diff --git a/app/models/follow.rb b/app/models/follow.rb index 8bfe8b2f6..b6b9dca7c 100644 --- a/app/models/follow.rb +++ b/app/models/follow.rb @@ -3,11 +3,14 @@ class Follow < ApplicationRecord include Paginable - belongs_to :account, counter_cache: :following_count - belongs_to :target_account, class_name: 'Account', counter_cache: :followers_count + belongs_to :account, counter_cache: :following_count, required: true + + belongs_to :target_account, + class_name: 'Account', + counter_cache: :followers_count, + required: true has_one :notification, as: :activity, dependent: :destroy - validates :account, :target_account, presence: true validates :account_id, uniqueness: { scope: :target_account_id } end diff --git a/app/models/follow_request.rb b/app/models/follow_request.rb index 4224ab15d..20e1332dd 100644 --- a/app/models/follow_request.rb +++ b/app/models/follow_request.rb @@ -3,12 +3,11 @@ class FollowRequest < ApplicationRecord include Paginable - belongs_to :account - belongs_to :target_account, class_name: 'Account' + belongs_to :account, required: true + belongs_to :target_account, class_name: 'Account', required: true has_one :notification, as: :activity, dependent: :destroy - validates :account, :target_account, presence: true validates :account_id, uniqueness: { scope: :target_account_id } def authorize! 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 |