Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-04-03 19:17:20 +00:00
parent 1f5bdd8445 d8d4217959
commit 6611100480
70 changed files with 924 additions and 271 deletions
--- a/app/models/account.rb
+++ b/app/models/account.rb
@ -97,6 +97,8 @@ class Account < ApplicationRecord
  has_many :reports
  has_many :targeted_reports, class_name: 'Report', foreign_key: :target_account_id

+  has_many :report_notes, dependent: :destroy
+
  # Moderation notes
  has_many :account_moderation_notes, dependent: :destroy
  has_many :targeted_moderation_notes, class_name: 'AccountModerationNote', foreign_key: :target_account_id, dependent: :destroy