Claire 3e63fcd4f0 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/models/status.rb`: Minor upstream refactor moved hook definitions around, and glitch-soc has an extra `before_create`. Moved the `before_create` accordingly. - `app/services/batched_remove_status_service.rb`: Minor upstream refactor changed a block in which glitch-soc had one extra call to handle direct timelines. Adapted changes to keep glitch-soc's extra call.		2023-01-12 10:15:46 +01:00
..
environments	Merge branch 'main' into glitch-soc/merge-upstream	2023-01-10 14:43:38 +01:00
initializers	Merge branch 'main' into glitch-soc/merge-upstream	2022-12-15 20:25:25 +01:00
locales	New Crowdin updates (#22953)	2023-01-11 21:41:34 +09:00
locales-glitch	Fix root key for glitch-soc pt-PT and pt-BR yaml translations (#2065)	2023-01-04 18:47:01 +01:00
webpack	Change locales file generation to use JSON sources (#2028)	2022-12-21 22:13:14 +01:00
application.rb	Add Western Frisian support (#18602)	2022-12-15 19:03:44 +01:00
boot.rb	Bump bootsnap from 1.6.0 to 1.8.1 (#16677)	2021-09-19 14:42:32 +09:00
brakeman.ignore	Fix IDN domains not being rendered correctly in a few left-over places (#17848)	2022-03-22 10:07:11 +01:00
database.yml	Change postgres connection timeout (#21790)	2022-12-07 00:39:36 +01:00
deploy.rb	Change `master` branch to `main` branch (#20290)	2022-11-10 04:02:05 +01:00
environment.rb	…
i18n-tasks.yml	Fix prettifier/lint issues (#2066)	2023-01-04 18:38:45 +01:00
navigation.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-17 12:01:37 +01:00
pghero.yml	Fix PgHero Content-Security-Policy when CDN_HOST is used (#13595)	2020-05-04 13:52:41 +02:00
puma.rb	feat(puma): enable setting min puma threads in addition to max (#21048)	2023-01-06 07:55:58 +01:00
roles.yml	Add customizable user roles (#18641)	2022-07-05 02:41:40 +02:00
routes.rb	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
secrets.yml	…
settings.yml	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-28 19:23:58 +02:00
sidekiq.yml	Add environment variable to configure sidekiq concurrency (#19589)	2022-12-15 16:38:37 +01:00
storage.yml	Update Mastodon to Rails 6.1 (#15910)	2021-03-24 10:44:31 +01:00
webpacker.yml	…