monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
mastodon/app/controllers
History
lenore gilbert c373148b3d
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 94e98864e3)

* 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 b91196f4b7)

* Fix authorization check in domain blocks controller

(cherry picked from commit 7527937758)

* 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 9094c2f52c)

* Fix domain block export not exporting blocks with only media rejection

(cherry picked from commit 26ff48ee48)

* 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: Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 		2022-11-17 11:05:09 +01:00
..
activitypub
…
admin Support for import/export of instance-level domain blocks/allows for 4.x w/ additional fixes (#20597) 2022-11-17 11:05:09 +01:00
api Make tag following idempotent (#20860) 2022-11-17 10:55:59 +01:00
auth Add 'private' to Cache-Control, match Rails expectations (#20608) 2022-11-16 04:56:30 +01:00
concerns Support for import/export of instance-level domain blocks/allows for 4.x w/ additional fixes (#20597) 2022-11-17 11:05:09 +01:00
disputes
…
filters
…
oauth Add 'private' to Cache-Control, match Rails expectations (#20608) 2022-11-16 04:56:30 +01:00
settings Add 'private' to Cache-Control, match Rails expectations (#20608) 2022-11-16 04:56:30 +01:00
well_known
…
about_controller.rb
…
accounts_controller.rb Fix invalid/empty RSS feed link on account pages (#20772) 2022-11-17 10:58:33 +01:00
application_controller.rb
…
authorize_interactions_controller.rb
…
custom_css_controller.rb
…
emojis_controller.rb
…
filters_controller.rb
…
follower_accounts_controller.rb
…
following_accounts_controller.rb
…
health_controller.rb
…
home_controller.rb
…
instance_actors_controller.rb
…
intents_controller.rb
…
invites_controller.rb
…
manifests_controller.rb
…
media_controller.rb
…
media_proxy_controller.rb
…
privacy_controller.rb
…
relationships_controller.rb
…
shares_controller.rb
…
statuses_cleanup_controller.rb Change automatic post deletion configuration to be accessible to redirected users (#20774) 2022-11-17 10:55:23 +01:00
statuses_controller.rb Remove dead code and refactor status threading code (#20357) 2022-11-10 22:30:00 +01:00
tags_controller.rb
…