Claire c2817c7fad Merge commit '752d49eefef48262d501ba5fc2006d2c8466a000' into glitch-soc/merge-upstream ... Conflicts: - `app/lib/feed_manager.rb`: Upstream changed how notifications from follow subscriptions were handled, refactoring this file in the process. Conflict is due to glitch-soc having an extra timeline type (direct). Ported upstream's changes. - `app/workers/feed_insert_worker.rb`: Ditto.		2024-12-02 21:08:15 +01:00
..
activitypub	…
api	Merge commit '752d49eefef48262d501ba5fc2006d2c8466a000' into glitch-soc/merge-upstream	2024-12-02 21:08:15 +01:00
auth/sessions	…
oauth	…
settings	…
statuses	…
well_known	…
account_show_page_spec.rb	…
accounts_spec.rb	…
anonymous_cookies_spec.rb	…
backups_spec.rb	…
cache_spec.rb	…
catch_all_route_request_spec.rb	…
content_security_policy_spec.rb	…
custom_css_spec.rb	…
custom_stylesheets_spec.rb	…
disabled_oauth_endpoints_spec.rb	…
emojis_spec.rb	…
follower_accounts_spec.rb	…
following_accounts_spec.rb	…
health_spec.rb	…
instance_actor_spec.rb	…
invite_spec.rb	…
invites_spec.rb	…
link_headers_spec.rb	…
localization_spec.rb	…
log_out_spec.rb	…
mail_subscriptions_spec.rb	…
manifest_spec.rb	…
media_proxy_spec.rb	…
media_spec.rb	…
omniauth_callbacks_spec.rb	…
remote_interaction_helper_spec.rb	…
self_destruct_spec.rb	…
severed_relationships_spec.rb	…
signature_verification_spec.rb	…
tags_spec.rb	…