You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Jeremy Kescher 3866d53b95 Merge remote-tracking branch 'upstream/main' into develop		1 year ago
..
environments	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
initializers	Merge remote-tracking branch 'upstream/main' into develop	1 year ago
locales	Merge remote-tracking branch 'upstream/main' into develop	1 year ago
locales-glitch	Merge remote-tracking branch 'upstream/main' into develop	1 year ago
webpack	Move locale-data back to `app/javascript/mastodon/locales/locale-data` (#2169)	1 year ago
application.rb	Change root Chewy strategy to emit a warning instead of erroring out in production mode (#24327)	1 year ago
boot.rb	Bump bootsnap from 1.6.0 to 1.8.1 (#16677)	3 years ago
brakeman.ignore	Fix IDN domains not being rendered correctly in a few left-over places (#17848)	2 years ago
database.yml	Fix pgBouncer resetting application name on every transaction (#23958)	1 year ago
deploy.rb	Change `master` branch to `main` branch (#20290)	2 years ago
environment.rb	Make PreviewCard records reuseable between statuses (#4642)	7 years ago
i18n-tasks.yml	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
navigation.rb	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
pghero.yml	Fix PgHero Content-Security-Policy when CDN_HOST is used (#13595)	4 years ago
puma.rb	Support the PROXY protocol through the PROXY_PROTO_V1 env variable (#24064)	1 year ago
roles.yml	Add customizable user roles (#18641)	2 years ago
routes.rb	Merge remote-tracking branch 'upstream/main' into develop	1 year ago
secrets.yml	Upgrade to Rails 5.0.0.1	8 years ago
settings.yml	Merge remote-tracking branch 'upstream/main' into develop	1 year ago
sidekiq.yml	Merge remote-tracking branch 'upstream/main' into develop	1 year ago
storage.yml	Update Mastodon to Rails 6.1 (#15910)	3 years ago
webpacker.yml	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago