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
..
activitypub	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
admin	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
api	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
auth	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
concerns	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
oauth	…
settings	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
well_known	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
about_controller.rb	…
account_follow_controller.rb	…
account_unfollow_controller.rb	…
accounts_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
application_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
authorize_interactions_controller.rb	…
custom_css_controller.rb	Remove set-cookie header on custom.css (#16314)	4 years ago
directories_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
emojis_controller.rb	…
filters_controller.rb	…
follower_accounts_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
following_accounts_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
health_controller.rb	Change health check (#15988)	4 years ago
home_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
instance_actors_controller.rb	…
intents_controller.rb	…
invites_controller.rb	…
manifests_controller.rb	…
media_controller.rb	…
media_proxy_controller.rb	Fix media proxy RedisLocks auto-releasing too fast (#16291)	4 years ago
public_timelines_controller.rb	…
relationships_controller.rb	…
remote_follow_controller.rb	…
remote_interaction_controller.rb	…
shares_controller.rb	…
statuses_cleanup_controller.rb	Fix account statuses cleanup settings controller for glitch-soc's theming system	3 years ago
statuses_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
tags_controller.rb	…