This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

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.		2021-09-26 18:28:59 +02:00
..
activitypub	Fix followers synchronization mechanism not working when URI has empty path (#16744)	2021-09-15 18:51:16 +02:00
admin	Add ability to skip sign-in token authentication for specific users (#16427)	2021-07-08 05:31:28 +02:00
api	Merge branch 'main' into glitch-soc/merge-upstream	2021-04-20 12:17:14 +02:00
auth	Fix authentication failures after going halfway through a sign-in attempt (#16607)	2021-08-25 22:52:41 +02:00
concerns	Fix cache_collection crashing when given an empty collection (#15921)	2021-03-18 00:41:32 +01:00
oauth	…
settings	Merge branch 'main' into glitch-soc/merge-upstream	2021-07-17 17:45:35 +02:00
well_known	Fix anonymous access to outbox not being cached by the reverse proxy (#16458)	2021-07-03 21:13:47 +02:00
about_controller_spec.rb	…
account_follow_controller_spec.rb	…
account_unfollow_controller_spec.rb	…
accounts_controller_spec.rb	Prepare Mastodon for Rails 6 (#15911)	2021-03-17 10:09:55 +01:00
application_controller_spec.rb	Merge branch 'main' into glitch-soc/merge-upstream	2021-03-24 10:53:50 +01:00
authorize_interactions_controller_spec.rb	Change ResolveAccountService's handling of skip_webfinger (#15750)	2021-02-24 06:32:13 +01:00
emojis_controller_spec.rb	…
follower_accounts_controller_spec.rb	Fix serialization of followers/following counts when user hides their network (#16418)	2021-06-21 20:14:47 +02:00
following_accounts_controller_spec.rb	Fix serialization of followers/following counts when user hides their network (#16418)	2021-06-21 20:14:47 +02:00
health_controller_spec.rb	Fix glitch-soc-specific health check spec	2021-04-05 15:21:38 +02:00
home_controller_spec.rb	Change routing paths to use usernames in web UI (#16171)	2021-09-26 05:46:13 +02:00
intents_controller_spec.rb	…
invites_controller_spec.rb	…
manifests_controller_spec.rb	…
media_controller_spec.rb	Stop setting a shortcode to newly-created media attachments (#16730)	2021-09-13 18:59:37 +02:00
media_proxy_controller_spec.rb	…
relationships_controller_spec.rb	Remove PubSubHubbub-related columns from accounts table (#16170)	2021-05-07 19:32:58 +02:00
remote_follow_controller_spec.rb	…
remote_interaction_controller_spec.rb	…
shares_controller_spec.rb	…
statuses_cleanup_controller_spec.rb	Add feature to automatically delete old toots (#16529)	2021-08-09 23:11:50 +02:00
statuses_controller_spec.rb	…
tags_controller_spec.rb	…