]> cat aescling's git repositories - mastodon.git/commit
Allow domain blocks that only reject media without silencing or suspending (#4325)
authorsdukhovni <dukhovni@mit.edu>
Mon, 24 Jul 2017 12:26:55 +0000 (22:26 +1000)
committerEugen Rochko <eugen@zeonfederated.com>
Mon, 24 Jul 2017 12:26:55 +0000 (14:26 +0200)
commit06d905f415f38ed8e13f6390a93a0db928dee6a7
treec2a3ff6b6d0ebc34c7c38e5dc35e312d294ec1af
parent0ad41be0f314a9ee16cd167620e0636859349cc8
Allow domain blocks that only reject media without silencing or suspending (#4325)

* Allow domain blocks to reject media without silencing or suspending

* Fix typo

* Hide 'Reject media' button when superfluous, instead of disabling it

* Properly hide 'reject media' checkbox on page load if needed

This may happen when resubmitting the domain block form after an error.

* Don't ask whether undoing a media-only block should be retroactive

* Rename :media_only block to :noop

* Display :noop block as None in frontend, allow blocks that do nothing

* Remove 'coding' line auto-added by emacs
app/models/domain_block.rb
app/services/block_domain_service.rb
app/services/unblock_domain_service.rb
app/views/admin/domain_blocks/show.html.haml
config/locales/en.yml