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 1665b84285 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `package.json`: Not really a conflict, just a glitch-soc-only dependency textually too close to an updated upstream one. - `yarn.lock`: Not really a conflict, just a glitch-soc-only dependency textually too close to an updated upstream one.		3 years ago
..
controllers	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
fabricators	Add feature to automatically delete old toots (#16529)	3 years ago
features	Add submit button to the top of preferences pages (#13068)	4 years ago
fixtures	Switch from unmaintained paperclip to kt-paperclip (#16724)	3 years ago
helpers	Merge branch 'master' into glitch-soc/merge-upstream	3 years ago
lib	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
mailers	Add Ruby 3.0 support (#16046)	3 years ago
models	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
policies	Merge branch 'master' into glitch-soc/merge-upstream	3 years ago
presenters	Change references to tootsuite/mastodon to mastodon/mastodon (#16491)	3 years ago
requests	Further preparation for Rails 6 (#15916)	3 years ago
routing	…
serializers/activitypub	Fix account URI in UpdatePollSerializer (#11194)	5 years ago
services	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
support	Fix base64-encoded file uploads not being possible (#12748)	4 years ago
validators	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
views	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
workers	Fix followers synchronization mechanism not working when URI has empty path (#16510)	3 years ago
rails_helper.rb	Add WebAuthn as an alternative 2FA method (#14466)	4 years ago
spec_helper.rb	Move rspec examples to tmp dir (#12539)	4 years ago