1
0
Fork 0
forked from gitea/nas

Merge pull request #340 from kmycode/upstream-20231209

Upstream 20231209
This commit is contained in:
KMY(雪あすか) 2023-12-09 10:31:50 +09:00 committed by GitHub
commit 0e32b3e7e6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
60 changed files with 1036 additions and 695 deletions

View file

@ -108,8 +108,7 @@ class Status < ApplicationRecord
has_and_belongs_to_many :tags
# Because of a composite primary key, the `dependent` option cannot be used on this association
has_one :preview_cards_status, inverse_of: :status # rubocop:disable Rails/HasManyOrHasOneDependent
has_one :preview_cards_status, inverse_of: :status, dependent: :delete
has_one :notification, as: :activity, dependent: :destroy
has_one :status_stat, inverse_of: :status, dependent: nil
@ -178,7 +177,6 @@ class Status < ApplicationRecord
# The `prepend: true` option below ensures this runs before
# the `dependent: destroy` callbacks remove relevant records
before_destroy :unlink_from_conversations!, prepend: true
before_destroy :reset_preview_card!
cache_associated :application,
:media_attachments,