diff options
| author | ThibG <thib@sitedethib.com> | 2019-08-08 09:25:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-08 09:25:00 +0200 |
| commit | aa485d6f055b93fd7a9df8b47ed96122b38af39e (patch) | |
| tree | c0a0bab3b7006e00b2a0881460d14fb7bd24c4aa /app/controllers/admin/instances_controller.rb | |
| parent | 86cfa2ea6cb94c9597b9fcda034c8b4d959c5e3e (diff) | |
| parent | 9b8edbea5b3f0e7690c645502a0f1dcd22fb8737 (diff) | |
Merge pull request #1194 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
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 |