Claire 5ac380c122 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/models/status.rb`: Upstream added lines close to a glitch-soc only line, not a real conflict. Applied upstream's changes (added hooks) while keeping glitch-soc's changes (`local_only` scope). - `config/environments/production.rb`: Upstream removed a header, while we have glitch-soc specific ones. Removed the header removed upstream.		2023-03-22 19:50:11 +01:00
..
environments	Merge branch 'main' into glitch-soc/merge-upstream	2023-03-22 19:50:11 +01:00
initializers
locales	Update profile link verification instructions (#19723)	2023-03-22 11:22:35 +01:00
locales-glitch	Normalize translations	2023-03-05 21:31:45 +01:00
webpack
application.rb
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	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-17 12:01:37 +01:00
pghero.yml
puma.rb	Support the PROXY protocol through the PROXY_PROTO_V1 env variable (#24064)	2023-03-14 14:47:57 +01:00
roles.yml
routes.rb
secrets.yml
settings.yml
sidekiq.yml
storage.yml
webpacker.yml