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 3622110778 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `streaming/index.js`: Filtering code for streaming notifications has been refactored upstream, but glitch-soc had similar code for local-only toots in the same places. Ported upstream changes, but did not refactor local-only filtering.		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	…
fixtures	Change references to tootsuite/mastodon to mastodon/mastodon (#16491)	3 years ago
helpers	…
lib	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
mailers	Add Ruby 3.0 support (#16046)	4 years ago
models	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
policies	…
presenters	Change references to tootsuite/mastodon to mastodon/mastodon (#16491)	3 years ago
requests	…
routing	…
serializers/activitypub	…
services	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
support	…
validators	Merge branch 'main' into glitch-soc/merge-upstream	4 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	…
spec_helper.rb	…