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 8ec4be4233 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: Not a real conflict, upstream-updated dependency (redis) textually too close to glitch-soc-only dependecy. Updated redis gem like upstream did.		3 years ago
..
environments	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
initializers	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
locales	Add feature to automatically delete old toots (#16529)	3 years ago
locales-glitch	Fix typo on simple_form.ko.yml	3 years ago
webpack	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
application.rb	New Crowdin updates (#16269)	4 years ago
boot.rb	Add clean error message when RAILS_ENV is unset (#15381)	4 years ago
brakeman.ignore	Ignore brakeman false positive warning (#16213)	4 years ago
database.yml	…
deploy.rb	Change references to tootsuite/mastodon to mastodon/mastodon (#16491)	3 years ago
environment.rb	…
i18n-tasks.yml	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
navigation.rb	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
pghero.yml	Fix PgHero Content-Security-Policy when CDN_HOST is used (#13595)	5 years ago
puma.rb	…
routes.rb	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
secrets.yml	…
settings.yml	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
sidekiq.yml	Add feature to automatically delete old toots (#16529)	3 years ago
storage.yml	Update Mastodon to Rails 6.1 (#15910)	4 years ago
webpacker.yml	…