]> cat aescling's git repositories - mastodon.git/commit
Add domain block notes (#11515)
authorThibG <thib@sitedethib.com>
Wed, 7 Aug 2019 18:20:23 +0000 (20:20 +0200)
committerEugen Rochko <eugen@zeonfederated.com>
Wed, 7 Aug 2019 18:20:23 +0000 (20:20 +0200)
commitbced70469a6c4aecdb3c71055f329a0f579eb14c
tree39028440b4ddc2e775369a41b86da5657a40c347
parent94c54997cf6dc3bef2af67a070a61cc10595339c
Add domain block notes (#11515)

* Add database columns for adding notes to domain blocks/restrctions

* Add admin UI to set private and public comments when blocking a domain

* Add text for private and public comments on domain blocks

* Show domain block comments in admin UI

* Add comments to the domain block undo page

* Make UnblockDomainService more robust regarding upgraded domain blocks

* Allow editing domain blocks

* Rename button from “undo domain block” to “view domain block” in account admin UI

* Change test to unsilence silenced users from upgraded blocks
17 files changed:
app/controllers/admin/domain_blocks_controller.rb
app/controllers/admin/instances_controller.rb
app/models/domain_block.rb
app/services/block_domain_service.rb
app/services/unblock_domain_service.rb
app/views/admin/accounts/show.html.haml
app/views/admin/domain_blocks/edit.html.haml [new file with mode: 0644]
app/views/admin/domain_blocks/new.html.haml
app/views/admin/domain_blocks/show.html.haml
app/views/admin/instances/show.html.haml
app/workers/domain_block_worker.rb
config/locales/en.yml
config/routes.rb
db/migrate/20190807135426_add_comments_to_domain_blocks.rb [new file with mode: 0644]
db/schema.rb
spec/services/unblock_domain_service_spec.rb
spec/workers/domain_block_worker_spec.rb