diff options
| author | Ondřej Hruška <ondra@ondrovo.com> | 2017-07-25 21:36:22 +0200 |
|---|---|---|
| committer | Ondřej Hruška <ondra@ondrovo.com> | 2017-07-25 21:36:22 +0200 |
| commit | 7e5691804d4f0019a89b8b8a3dad532bc9d940ea (patch) | |
| tree | 84c2f4e4ac07bea3915639a50df84eb62b6c5768 /app/models/domain_block.rb | |
| parent | 852acbd7385a640d9e00e462d58a847851744034 (diff) | |
| parent | 7232cdf7e8249f79078005931b1165e54e413fa9 (diff) | |
Merge git://github.com/tootsuite/mastodon into tootsuite-master
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 |