Claire 0b2c7cdb02 Merge commit 'fe2667bb0d3487a32b9da5250402a90482a85fe2' into glitch-soc/merge-upstream ... Conflicts: - `app/lib/content_security_policy.rb`: Conflict caused by glitch-soc's support for the extra `EXTRA_DATA_HOSTS` environment variable. Ported upstream's changes while keeping support for `EXTRA_DATA_HOSTS`.		2024-01-10 17:51:12 +01:00
..
activitypub	…
admin	Fix NULL MX handling and tighten DNS resolving specs (#28607)	2024-01-05 11:07:57 +00:00
api	Merge branch 'main' into glitch-soc/merge-upstream	2023-12-28 16:57:10 +01:00
auth	Add ability to require approval when users sign up using specific email domains (#28468)	2024-01-04 09:07:05 +00:00
concerns	Convert signature verification specs to request specs (#28443)	2023-12-22 18:56:22 +00:00
disputes	…
filters	…
oauth	Clean up of `RSpec/LetSetup` within `spec/controllers` (#28446)	2023-12-21 09:28:41 +00:00
settings	Merge branch 'main' into glitch-soc/merge-upstream	2023-12-28 16:57:10 +01:00
.rubocop.yml	…
about_controller_spec.rb	…
application_controller_spec.rb	…
authorize_interactions_controller_spec.rb	…
custom_css_controller_spec.rb	…
emojis_controller_spec.rb	…
filters_controller_spec.rb	…
follower_accounts_controller_spec.rb	Clean up of `RSpec/LetSetup` within `spec/controllers` (#28446)	2023-12-21 09:28:41 +00:00
following_accounts_controller_spec.rb	Clean up of `RSpec/LetSetup` within `spec/controllers` (#28446)	2023-12-21 09:28:41 +00:00
health_controller_spec.rb	…
home_controller_spec.rb	…
instance_actors_controller_spec.rb	…
intents_controller_spec.rb	…
invites_controller_spec.rb	…
manifests_controller_spec.rb	…
media_controller_spec.rb	…
media_proxy_controller_spec.rb	…
privacy_controller_spec.rb	…
relationships_controller_spec.rb	…
shares_controller_spec.rb	…
statuses_cleanup_controller_spec.rb	…
statuses_controller_spec.rb	…
tags_controller_spec.rb	…