Claire f05985f8ec Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream changed their README, we have a completely different one. Kept our version.		2023-09-21 15:12:00 +02:00
..
environments	Merge branch 'main' into glitch-soc/merge-upstream	2023-09-05 20:34:17 +02:00
imagemagick	Fix AVIF attachments (#26264)	2023-08-01 19:34:11 +02:00
initializers	Merge branch 'main' into glitch-soc/merge-upstream	2023-09-21 15:12:00 +02:00
locales	New Crowdin Translations (automated) (#27005)	2023-09-21 11:06:04 +02:00
locales-glitch	New Crowdin translations (#2388)	2023-08-29 08:28:45 +02:00
routes	Merge commit 'b90383d07388fe8513e59a6deb1a2391146c6561' into glitch-soc/merge-upstream	2023-09-15 21:39:21 +02:00
webpack	Merge commit 'b1d89071384ef028c97a3d28cf8cf6bc0ca6c4ce' into glitch-soc/merge-upstream	2023-09-15 21:06:45 +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
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 'be991f1d18006a4820c1e9ca6625bf2bd2bfedac' into glitch-soc/merge-upstream	2023-09-02 14:44:47 +02:00
navigation.rb	Merge commit '05093266e6e3c54f9096da9cdcdafdc83703c578' into glitch-soc/merge-upstream	2023-09-02 15:02:29 +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
sidekiq.yml	Add admin notifications for new Mastodon versions (#26582)	2023-09-01 17:47:07 +02:00
storage.yml
webpacker.yml	Merge commit '4ad1c5aa7174e5cef4ba9608a44429916a119bee' into glitch-soc/merge-upstream	2023-09-02 13:31:15 +02:00