Claire 50b430d9a2 Merge branch 'main' into glitch-soc/merge-upstream ...

- `app/views/statuses/_simple_status.html.haml`:
  Small markup change in glitch-soc, on a line that has been modified by
  upstream. Ported upstream changes.

2021-05-07 18:21:59 +02:00

..

activitypub

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

2021-05-07 18:21:59 +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

Add IP-based rules (#14963)

2020-10-12 16:33:49 +02:00

feed_manager_spec.rb

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

2020-12-09 14:42:33 +01:00

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

…

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

…