Skip to content
Snippets Groups Projects
  1. Jan 18, 2023
  2. Nov 17, 2022
    • lenore gilbert's avatar
      Support for import/export of instance-level domain blocks/allows for 4.x w/... · c373148b
      lenore gilbert authored
      Support for import/export of instance-level domain blocks/allows for 4.x w/ additional fixes (#20597)
      
      * Allow import/export of instance-level domain blocks/allows (#1754)
      
      * Allow import/export of instance-level domain blocks/allows.
      Fixes #15095
      
      * Pacify circleci
      
      * Address simple code review feedback
      
      * Add headers to exported CSV
      
      * Extract common import/export functionality to
      AdminExportControllerConcern
      
      * Add additional fields to instance-blocked domain export
      
      * Address review feedback
      
      * Split instance domain block/allow import/export into separate pages/controllers
      
      * Address code review feedback
      
      * Pacify DeepSource
      
      * Work around Paperclip::HasAttachmentFile for Rails 6
      
      * Fix deprecated API warning in export tests
      
      * Remove after_commit workaround
      
      (cherry picked from commit 94e98864e39c010635e839fea984f2b4893bef1a)
      
      * Add confirmation page when importing blocked domains (#1773)
      
      * Move glitch-soc-specific strings to glitch-soc-specific locale files
      
      * Add confirmation page when importing blocked domains
      
      (cherry picked from commit b91196f4b73fff91997b8077619ae25b6d04a59e)
      
      * Fix authorization check in domain blocks controller
      
      (cherry picked from commit 75279377583c6e2aa04cc8d7380c593979630b38)
      
      * Fix error strings for domain blocks and email-domain blocks
      
      Corrected issue with non-error message used for Mastodon:NotPermittedError in Domain Blocks
      Corrected issue Domain Blocks using the Email Domain Blocks message on ActionContoller::ParameterMissing
      Corrected issue with Email Domain Blocks using the not_permitted string from "custom emojii's"
      
      * Ran i18n-tasks normalize to address test failure
      
      * Removed unused admin.export_domain_blocks.not_permitted string
      
      Removing unused string as indicated by Check i18n
      
      * Fix tests
      
      (cherry picked from commit 9094c2f52c24e1c00b594e7c11cd00e4a07eb431)
      
      * Fix domain block export not exporting blocks with only media rejection
      
      (cherry picked from commit 26ff48ee48a5c03a2a4b0bd03fd322529e6bd960)
      
      * Fix various issues with domain block import
      
      - stop using Paperclip for processing domain allow/block imports
      - stop leaving temporary files
      - better error handling
      - assume CSV files are UTF-8-encoded
      
      (cherry picked from commit cad824d8f501b95377e4f0a957e5a00d517a1902)
      
      Co-authored-by: default avatarLevi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
      Co-authored-by: default avatarClaire <claire.github-309c@sitedethib.com>
      c373148b
Loading