diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2023-01-18 18:41:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-18 18:41:24 +0100 |
| commit | 01405bc6f84fd9cfb974e1e668465148bda47ac5 (patch) | |
| tree | cb3103c82a337178a3548e1a157e0fa94be37bdb /spec/fixtures/files | |
| parent | 472fd4307f9c963aba57e537e3ca3a8f94dfa139 (diff) | |
| parent | 3f74235ac5b6ce6f13c531506f30c466da2a7aa1 (diff) | |
Merge pull request #2087 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'spec/fixtures/files')
| -rw-r--r-- | spec/fixtures/files/domain_blocks.csv | 6 | ||||
| -rw-r--r-- | spec/fixtures/files/domain_blocks_list.txt | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/spec/fixtures/files/domain_blocks.csv b/spec/fixtures/files/domain_blocks.csv index 28ffb9175..9dbfb4eaf 100644 --- a/spec/fixtures/files/domain_blocks.csv +++ b/spec/fixtures/files/domain_blocks.csv @@ -1,4 +1,4 @@ #domain,#severity,#reject_media,#reject_reports,#public_comment,#obfuscate -bad.domain,silence,false,false,bad,false -worse.domain,suspend,true,true,worse,true -reject.media,noop,true,false,reject media,false +bad.domain,silence,false,false,bad server,false +worse.domain,suspend,true,true,worse server,true +reject.media,noop,true,false,reject media and test unicode characters ♥,false diff --git a/spec/fixtures/files/domain_blocks_list.txt b/spec/fixtures/files/domain_blocks_list.txt new file mode 100644 index 000000000..7b6b24253 --- /dev/null +++ b/spec/fixtures/files/domain_blocks_list.txt @@ -0,0 +1,3 @@ +bad.domain +worse.domain +reject.media |