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
initializers
locales	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-10 09:36:47 +01:00
locales-glitch
webpack
application.rb	Fix mailers queue not being used for mailers (#20274)	2022-11-10 02:31:09 +01:00
boot.rb
brakeman.ignore
database.yml
deploy.rb	Change master branch to main branch (#20290)	2022-11-10 04:02:05 +01:00
environment.rb
i18n-tasks.yml
navigation.rb
pghero.yml
puma.rb
roles.yml
routes.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-10 09:36:47 +01:00
secrets.yml
settings.yml
sidekiq.yml	Change account deletion requests to spread out over time (#20222)	2022-11-09 14:08:19 +01:00
storage.yml
webpacker.yml