diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2020-12-15 14:27:06 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2020-12-15 14:27:06 +0100 |
| commit | e4f8679eaeea062e1f9ca9f58703b51ff8162c35 (patch) | |
| tree | 13940a853f1278a3c4ef89dd3a0bbedfeaaf7140 /app/models/domain_block.rb | |
| parent | 1978f7265e1e83bda25413da26f53c53110af764 (diff) | |
| parent | 8485c436d5d083c28df8c942fe521bfb46edfc9f (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/models/form/admin_settings.rb`: New setting added upstream. Ported it. - `app/views/statuses/_simple_status.html.haml`: Upstream removed RTL classes. Did the same. - `config/settings.yml`: New setting added upstream. Ported it.
Diffstat (limited to 'app/models/domain_block.rb')
| -rw-r--r-- | app/models/domain_block.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/domain_block.rb b/app/models/domain_block.rb index 2b18e01fa..829d7583b 100644 --- a/app/models/domain_block.rb +++ b/app/models/domain_block.rb @@ -16,6 +16,7 @@ class DomainBlock < ApplicationRecord include DomainNormalizable + include DomainMaterializable enum severity: [:silence, :suspend, :noop] |