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

Claire f8d867bac4 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/services/remove_status_service.rb`: Conflict caused by us having a distinc Direct timeline. Ported upstream changes. - `app/javascript/mastodon/features/compose/components/compose_form.js`: Conflict between glitch-soc's variable character limit and upstream refactoring that part of the code. Ported upstream changes.		4 years ago
..
environments	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
initializers	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
locales	New Crowdin updates (#15137)	4 years ago
locales-glitch	Glitchsoc translation to 'es' language (#1439)	4 years ago
webpack	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
application.rb	Fix streaming API allowing connections to persist after access token invalidation (#15111)	4 years ago
boot.rb	Fix bootsnap cache directory being declared relatively (#9511)	6 years ago
brakeman.ignore	Add E2EE API (#13820)	5 years ago
database.yml	config: add DB_SSLMODE for managed/remote PG (#10210)	6 years ago
deploy.rb	Bump capistrano from 3.14.0 to 3.14.1 (#14037)	5 years ago
environment.rb	…
i18n-tasks.yml	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
navigation.rb	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
pghero.yml	Fix PgHero Content-Security-Policy when CDN_HOST is used (#13595)	5 years ago
puma.rb	Add PERSISTENT_TIMEOUT option (#11756)	5 years ago
routes.rb	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
secrets.yml	…
settings.yml	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
sidekiq.yml	Change trending hashtags to not disappear instantly after midnight (#11712)	5 years ago
webpacker.yml	Do not try to parse gif files as CSS or JS	6 years ago