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 29b5c5f483 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/models/custom_emoji.rb`: Slight refactor upstream, next to a line that was different in glitch-soc because of our local configurable limits on custom emoji size. Ported upstream changes. - `yarn.lock`: Not really a conflict, upstream dependency textually too close to a glitch-soc-only dependency. Updated upstream dependency as upstream.		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	Fix suspicious sign-in mail text being out of date (#16690)	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	Switch from unmaintained paperclip to kt-paperclip (#16724)	3 years ago
boot.rb	Bump bootsnap from 1.6.0 to 1.8.1 (#16677)	3 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	…
navigation.rb	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
pghero.yml	…
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	…
webpacker.yml	…