diff options
| author | sdukhovni <dukhovni@mit.edu> | 2017-07-24 22:26:55 +1000 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-07-24 14:26:55 +0200 |
| commit | 06d905f415f38ed8e13f6390a93a0db928dee6a7 (patch) | |
| tree | c2a3ff6b6d0ebc34c7c38e5dc35e312d294ec1af /app/models/domain_block.rb | |
| parent | 0ad41be0f314a9ee16cd167620e0636859349cc8 (diff) | |
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
Diffstat (limited to 'app/models/domain_block.rb')
| -rw-r--r-- | app/models/domain_block.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/domain_block.rb b/app/models/domain_block.rb index f26e8183f..aea8919af 100644 --- a/app/models/domain_block.rb +++ b/app/models/domain_block.rb @@ -12,7 +12,7 @@ # class DomainBlock < ApplicationRecord - enum severity: [:silence, :suspend] + enum severity: [:silence, :suspend, :noop] attr_accessor :retroactive |