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.

Thibaut Girka 9748f074a3 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/api/v1/timelines/public_controller.rb - app/lib/feed_manager.rb - app/models/status.rb - app/services/precompute_feed_service.rb - app/workers/feed_insert_worker.rb - spec/models/status_spec.rb All conflicts are due to upstream refactoring feed management and us having local-only toots on top of that. Rewrote local-only toots management for upstream's changes.		4 years ago
..
about	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
accounts	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
admin	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
admin_mailer	…
application	Fix lock icon not being shown when locking account in profile settings (#14190)	4 years ago
auth	Adapt 2FA changes to glitch-soc's theming system	4 years ago
authorize_interactions	…
directories	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
errors	…
filters	…
follower_accounts	…
following_accounts	…
home	…
invites	…
kaminari	…
layouts	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
media	Fix embedded player	4 years ago
notification_mailer	…
oauth	…
public_timelines	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
relationships	…
remote_follow	…
remote_interaction	…
settings	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
shared	…
shares	…
statuses	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
tags	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
user_mailer	Add WebAuthn as an alternative 2FA method (#14466)	4 years ago
well_known/host_meta	…