Claire f3a4d57be1 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Discarded upstream changes: we have our own README - `app/controllers/follower_accounts_controller.rb`: Port upstream's minor refactoring		2022-12-15 20:25:25 +01:00
..
environments	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-17 12:01:37 +01:00
initializers	Merge branch 'main' into glitch-soc/merge-upstream	2022-12-15 20:25:25 +01:00
locales	Add explanation text to log-in page (#20946)	2022-12-15 16:44:29 +01:00
locales-glitch	initial translation of Glitch-specific texts into Czech (#1997)	2022-12-08 10:38:52 +01:00
webpack	Merge branch 'main' into glitch-soc/merge-upstream	2022-12-15 20:25:25 +01:00
application.rb	Add Western Frisian support (#18602)	2022-12-15 19:03:44 +01:00
boot.rb	…
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	Revert "Revert "Change "Allow trends without prior review" setting to include statuses (#17977)""	2022-11-12 10:17:22 +01:00
navigation.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-17 12:01:37 +01:00
pghero.yml	…
puma.rb	…
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	…
webpacker.yml	…