Claire 449dc30739 Merge commit 'c43508b3e0b05c5e739d726bad53f1eef89e9376' into glitch-soc/merge-upstream ... Conflicts: - `app/lib/content_security_policy.rb`: Upstream added support for `EXTRA_MEDIA_HOSTS` which is very similar to glitch-soc's `EXTRA_DATA_HOST`. Deprecate `EXTRA_DATA_HOST` FOR `EXTRA_MEDIA_HOST`.		2025-03-26 19:14:26 +01:00
..
environments	Use a system setting for the Referer policy (#33239)	2024-12-10 13:16:52 +00:00
imagemagick	Drop favicon.ico generation (#30375)	2024-06-26 13:44:08 +00:00
initializers	Merge commit '30e334b51a4e7add05401895bff5a2ea4a97e0bd' into glitch-soc/merge-upstream	2025-03-17 20:25:32 +01:00
locales	New Crowdin Translations (automated) (#34276)	2025-03-26 07:42:25 +00:00
locales-glitch	New Crowdin Translations (automated) (#2933)	2025-02-12 20:53:09 +01:00
routes	Merge commit '04492e7f934d07f8e89fa9c3d4fe3381f251e8a2' into glitch-soc/merge-upstream	2025-03-07 18:34:27 +01:00
templates	Add min. age to terms of service (#34105)	2025-03-07 11:50:52 +00:00
webpack	Merge commit '2e9b2df570af19b67a5ccc754c7b581034ca79c6' into glitch-soc/merge-upstream	2025-03-24 20:06:25 +01:00
application.rb	Refactoring: Move rack middleware (#34140)	2025-03-11 15:24:06 +00:00
boot.rb
brakeman.yml
captcha.yml	Move hcaptcha service config to config_for yml (#30662)	2024-10-23 14:25:43 +00:00
database.yml	DB Replica database_tasks as ENV (#32908)	2024-11-19 08:54:28 +00:00
environment.rb
formatjs-formatter.js
i18n-tasks.yml	Merge commit 'c40ab43dc703be988c277d4ba6b7987a3a80e16c' into glitch-soc/merge-upstream	2024-10-06 16:07:58 +02:00
mastodon.yml	Merge commit '420ffdfb6259740602d4ce727ed5c60432c776a5' into glitch-soc/merge-upstream	2025-03-11 18:44:32 +01:00
navigation.rb	Merge commit '82d2ce293d98a2b9e024bc5396c3586904d46ae5' into glitch-soc/merge-upstream	2025-01-06 20:36:25 +01:00
pghero.yml
puma.rb	Add an optional metric exporter (#33734)	2025-01-27 12:52:30 +00:00
roles.yml
routes.rb	Add effective date to terms of service (#33993)	2025-03-05 09:01:33 +00:00
settings.yml	Merge commit '877090518682b6c77ba9bdfa0231afd56daec44d' into glitch-soc/merge-upstream	2024-12-25 18:01:37 +01:00
sidekiq.yml
translation.yml	Move translation service config to config_for yml (#30663)	2024-10-23 13:32:18 +00:00
webpacker.yml	Merge commit '3b1ba46c93de63268d20104dee63374d0708deb0' into glitch-soc/merge-upstream	2025-02-04 18:38:41 +01:00