diff options
author | David Yip <yipdw@member.fsf.org> | 2018-01-19 15:22:10 -0600 |
---|---|---|
committer | David Yip <yipdw@member.fsf.org> | 2018-01-19 15:22:10 -0600 |
commit | 2ca965c704075467226dbf798e13ac8e0e62cc15 (patch) | |
tree | c437e1f4993a6337759eb09157c78cd8134fd774 /app/models/mention.rb | |
parent | 2b2de41bc7ecec15aa73650da153e50f0e16f16b (diff) | |
parent | 0b888acfd4ffddd29f25c878373e9b9f5ec6c0ab (diff) |
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts: app/javascript/styles/mastodon/components.scss app/javascript/styles/mastodon/modal.scss
Diffstat (limited to 'app/models/mention.rb')
-rw-r--r-- | app/models/mention.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/mention.rb b/app/models/mention.rb index 14533e6a9..f864bf8e1 100644 --- a/app/models/mention.rb +++ b/app/models/mention.rb @@ -11,8 +11,8 @@ # class Mention < ApplicationRecord - belongs_to :account, inverse_of: :mentions, required: true - belongs_to :status, required: true + belongs_to :account, inverse_of: :mentions + belongs_to :status has_one :notification, as: :activity, dependent: :destroy |