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

Merge branch 'main' into glitch-soc/merge-upstream

2021-09-14 13:50:30 +02:00

connection_pool

…

ostatus

…

proof_provider/keybase

…

rss

…

settings

…

delivery_failure_tracker_spec.rb

…

entity_cache_spec.rb

Fix cache_collection crashing when given an empty collection (#15921)

2021-03-18 00:41:32 +01:00

extractor_spec.rb

…

fast_ip_map_spec.rb

…

feed_manager_spec.rb

…

formatter_spec.rb

Merge branch 'main' into glitch-soc/merge-upstream

2021-03-02 12:06:58 +01:00

hash_object_spec.rb

…

language_detector_spec.rb

…

permalink_redirector_spec.rb

Change routing paths to use usernames in web UI (#16171)

2021-09-26 05:46:13 +02:00

request_pool_spec.rb

…

request_spec.rb

…

sanitize_config_spec.rb

Merge branch 'main' into glitch-soc/merge-upstream

2021-03-19 13:57:15 +01:00

status_filter_spec.rb

…

status_finder_spec.rb

…

tag_manager_spec.rb

Change multiple mentions with same username to render with domain (#15718)

2021-04-10 11:51:02 +02:00

user_settings_decorator_spec.rb

…

webfinger_resource_spec.rb

…