diff options
| author | Reverite <github@reverite.sh> | 2019-06-26 20:31:07 -0700 |
|---|---|---|
| committer | Reverite <github@reverite.sh> | 2019-06-26 20:31:07 -0700 |
| commit | 3fa90982efda2109ddf90d81f5ed3449f8282642 (patch) | |
| tree | e5514f4c72c9ffb44059a2afb7fdf24d0348bbd4 /app/controllers/admin/instances_controller.rb | |
| parent | 714940de498e93a8bf40dcda1835217df18741bf (diff) | |
| parent | 9ef25877dfda12cf31ec586294e4d4908f5be4f0 (diff) | |
Merge branch 'glitch' into production
Diffstat (limited to 'app/controllers/admin/instances_controller.rb')
| -rw-r--r-- | app/controllers/admin/instances_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/admin/instances_controller.rb b/app/controllers/admin/instances_controller.rb index 6dd659a30..7888e844f 100644 --- a/app/controllers/admin/instances_controller.rb +++ b/app/controllers/admin/instances_controller.rb @@ -18,7 +18,7 @@ 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) - @domain_block = DomainBlock.find_by(domain: params[:id]) + @domain_block = DomainBlock.rule_for(params[:id]) end private |