Claire c118918520 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/models/custom_emoji.rb`: Not a real conflict, just upstream changing a line too close to a glitch-soc-specific validation. Applied upstream changes. - `app/models/public_feed.rb`: Not a real conflict, just upstream changing a line too close to a glitch-soc-specific parameter documentation. Applied upstream changes.		2022-11-10 09:36:47 +01:00
..
environments	Merge branch 'main' into glitch-soc/merge-upstream	2022-08-25 05:07:39 +02:00
initializers	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-28 19:23:58 +02:00
locales	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-10 09:36:47 +01:00
locales-glitch	Use DEFAULT_FIELDS_SIZE/MAX_PROFILE_FIELDS value in settings form hint (#1870)	2022-10-21 12:01:37 +02:00
webpack	Merge branch 'main' into glitch-soc/merge-upstream	2022-08-28 11:31:00 +02:00
application.rb	Fix `mailers` queue not being used for mailers (#20274)	2022-11-10 02:31:09 +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	Format JSON and YAML using Prettier (#17823)	2022-03-21 04:46:11 +01:00
deploy.rb	Change `master` branch to `main` branch (#20290)	2022-11-10 04:02:05 +01:00
environment.rb	…
i18n-tasks.yml	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-28 19:23:58 +02:00
navigation.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-28 19:23:58 +02:00
pghero.yml	…
puma.rb	…
roles.yml	Add customizable user roles (#18641)	2022-07-05 02:41:40 +02:00
routes.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-10 09:36:47 +01:00
secrets.yml	…
settings.yml	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-28 19:23:58 +02:00
sidekiq.yml	Change account deletion requests to spread out over time (#20222)	2022-11-09 14:08:19 +01:00
storage.yml	…
webpacker.yml	…