diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-08-08 08:44:33 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-08-08 08:44:33 +0200 |
| commit | ebc0521ba82cfc43094a1aead868c61118767030 (patch) | |
| tree | afc3e03fc60c990e263e9721d3e0c6493d492d8a /app/controllers/admin/instances_controller.rb | |
| parent | 86cfa2ea6cb94c9597b9fcda034c8b4d959c5e3e (diff) | |
| parent | f51c7c105f1d04520656c1235f8a5f58d256fd0e (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'app/controllers/admin/instances_controller.rb')
| -rw-r--r-- | app/controllers/admin/instances_controller.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/admin/instances_controller.rb b/app/controllers/admin/instances_controller.rb index d4f201807..b47b18f8e 100644 --- a/app/controllers/admin/instances_controller.rb +++ b/app/controllers/admin/instances_controller.rb @@ -21,6 +21,8 @@ module Admin @blocks_count = Block.where(target_account: Account.where(domain: params[:id])).count @available = DeliveryFailureTracker.available?(Account.select(:shared_inbox_url).where(domain: params[:id]).first&.shared_inbox_url) @media_storage = MediaAttachment.where(account: Account.where(domain: params[:id])).sum(:file_file_size) + @private_comment = @domain_block&.private_comment + @public_comment = @domain_block&.public_comment end private |