Claire fe5f6bc7ed Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.github/workflows/build-image.yml`: Fix erroneous deletion in a previous merge. - `Gemfile`: Conflict caused by glitch-soc-only hCaptcha dependency - `app/controllers/auth/sessions_controller.rb`: Minor conflict due to glitch-soc's theming system. - `app/controllers/filters_controller.rb`: Minor conflict due to glitch-soc's theming system. - `app/serializers/rest/status_serializer.rb`: Minor conflict due to glitch-soc having an extra `local_only` property		2022-06-28 11:11:18 +02:00
..
environments	Merge branch 'main' into glitch-soc/merge-upstream	2022-04-25 17:09:32 +02:00
initializers	Merge branch 'main' into glitch-soc/merge-upstream	2022-06-02 09:49:38 +02:00
locales	Revamp post filtering system (#18058)	2022-06-28 09:42:13 +02:00
locales-glitch	Make “Flavour and skin” admin setting label translatable (#1791)	2022-05-31 16:52:52 +02:00
webpack	Merge branch 'main' into glitch-soc/merge-upstream	2022-04-04 17:25:57 +02:00
application.rb	Change search indexing to use batches to minimize resource usage (#18451)	2022-05-18 23:29:14 +02: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	Format JSON and YAML using Prettier (#17823)	2022-03-21 04:46:11 +01:00
deploy.rb	Bump capistrano from 3.16.0 to 3.17.0 (#17774)	2022-03-29 18:49:00 +09:00
environment.rb	Make PreviewCard records reuseable between statuses (#4642)	2017-09-01 16:20:16 +02:00
i18n-tasks.yml	Merge branch 'main' into glitch-soc/merge-upstream	2022-04-08 19:53:32 +02:00
navigation.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-06-10 11:51:43 +02:00
pghero.yml	Fix PgHero Content-Security-Policy when CDN_HOST is used (#13595)	2020-05-04 13:52:41 +02:00
puma.rb	Add PERSISTENT_TIMEOUT option (#11756)	2019-09-04 20:44:08 +02:00
routes.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-06-28 11:11:18 +02:00
secrets.yml	Upgrade to Rails 5.0.0.1	2016-08-17 17:58:00 +02:00
settings.yml	Merge branch 'main' into glitch-soc/merge-upstream	2022-04-08 19:53:32 +02:00
sidekiq.yml	Change search indexing to use batches to minimize resource usage (#18451)	2022-05-18 23:29:14 +02:00
storage.yml	Update Mastodon to Rails 6.1 (#15910)	2021-03-24 10:44:31 +01:00
webpacker.yml	Do not try to parse gif files as CSS or JS	2019-03-16 14:23:50 +01:00