Claire afc3b12217 Merge commit '4ad1c5aa7174e5cef4ba9608a44429916a119bee' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream has updated their README, we have a completely different one. Kept ours. - `config/initializers/content_security_policy.rb`: Upstream has updated their development CSPs, while we disable CSPs in the development environment. Kept our version.		2023-09-02 13:31:15 +02:00
..
environments	Merge commit '4ad1c5aa7174e5cef4ba9608a44429916a119bee' into glitch-soc/merge-upstream	2023-09-02 13:31:15 +02:00
imagemagick	Fix AVIF attachments (#26264)	2023-08-01 19:34:11 +02:00
initializers	Support webpacker live-reloading on Docker (#26419)	2023-08-29 10:17:57 +02:00
locales	Improve error messages when DeepL quota is exceeded (#26704)	2023-08-29 09:14:44 +02:00
locales-glitch	New Crowdin translations (#2388)	2023-08-29 08:28:45 +02:00
routes	Merge commit 'facfec1ba36cee27f232ebff90b990933719235a' into glitch-soc/merge-upstream	2023-08-24 21:03:56 +02:00
webpack	Merge commit 'dc09c10fa8cc9230bf14e48d790c8f0c26043f8f' into glitch-soc/merge-upstream	2023-08-24 21:26:27 +02:00
application.rb	Allow setting a custom HTTP method in CacheBuster (#26528)	2023-08-18 08:18:40 +02:00
boot.rb	Enable Rubocop Style/FrozenStringLiteralComment (#23793)	2023-07-12 09:47:08 +02:00
brakeman.ignore	Ignore the brakeman `PermitAttributes` check (#25915)	2023-07-28 23:17:53 +02:00
brakeman.yml	Ignore the brakeman `PermitAttributes` check (#25915)	2023-07-28 23:17:53 +02:00
database.yml	Change `DB_REPLICA_*` environment variables to `REPLICA_DB_*` (#26386)	2023-08-08 13:59:40 +02:00
deploy.rb	Fix Performance/CollectionLiteralInLoop cop (#24819)	2023-05-04 05:33:55 +02:00
environment.rb	Enable Rubocop Style/FrozenStringLiteralComment (#23793)	2023-07-12 09:47:08 +02:00
formatjs-formatter.js	Merge commit '44cd88adc4e2f4028dcc2b08b98368f0dc90cee4' into glitch-soc/merge-upstream	2023-06-10 12:38:33 +02:00
i18n-tasks.yml	Merge commit 'cfd50f30bb5dda4dd90e1ad01f3e62c99135c36f' into glitch-soc/merge-upstream	2023-07-30 14:33:28 +02:00
navigation.rb	Merge commit 'd9c21293aa6e105cedeff6b5e469af40a20909d9' into glitch-soc/merge-upstream	2023-08-22 18:31:28 +02:00
pghero.yml	…
puma.rb	Enable Rubocop Style/FrozenStringLiteralComment (#23793)	2023-07-12 09:47:08 +02:00
roles.yml	…
routes.rb	Merge commit '3554c527954441fd924586a49c7d99a89101ac7e' into glitch-soc/merge-upstream	2023-07-30 16:11:55 +02:00
secrets.yml	…
settings.yml	Merge commit 'bec6a1cad4c509c53deb378c7ba984ba7e2de5a9' into glitch-soc/merge-upstream	2023-05-25 22:49:18 +02:00
sidekiq.yml	Change indexing frequency from 5 minutes to 1 minute, add locks to schedulers (#26304)	2023-08-03 11:04:05 +02:00
storage.yml	…
webpacker.yml	Merge commit '4ad1c5aa7174e5cef4ba9608a44429916a119bee' into glitch-soc/merge-upstream	2023-09-02 13:31:15 +02:00