Claire abfdafef1e Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/auth/setup_controller.rb`: Upstream removed a method close to a glitch-soc theming-related method. Removed the method like upstream did.		2023-04-22 10:06:11 +02:00
..
environments	Merge branch 'main' into glitch-soc/merge-upstream	2023-03-22 19:50:11 +01:00
initializers	Fix most rubocop issues (#2165)	2023-04-09 11:25:30 +02:00
locales	Add progress indicator to sign-up flow (#24545)	2023-04-16 07:01:24 +02:00
locales-glitch	New Crowdin updates (#2172)	2023-04-16 17:25:43 +02:00
webpack	Move locale-data back to `app/javascript/mastodon/locales/locale-data` (#2169)	2023-04-08 14:11:40 +02:00
application.rb	Change root Chewy strategy to emit a warning instead of erroring out in production mode (#24327)	2023-04-03 15:05:39 +02: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	Fix pgBouncer resetting application name on every transaction (#23958)	2023-03-05 01:52:42 +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	2023-01-18 17:38:11 +01:00
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	Add customizable user roles (#18641)	2022-07-05 02:41:40 +02:00
routes.rb	Merge branch 'main' into glitch-soc/merge-upstream	2023-04-22 10:06:11 +02:00
secrets.yml	…
settings.yml	Merge branch 'main' into glitch-soc/merge-upstream	2023-03-31 21:30:27 +02:00
sidekiq.yml	Bump sidekiq-scheduler from 4.0.3 to 5.0.0 (#23212)	2023-02-13 13:31:42 +01:00
storage.yml	…
webpacker.yml	Merge branch 'main' into glitch-soc/merge-upstream	2023-04-03 17:40:59 +02:00