Claire d8fdbb054e Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/validators/status_length_validator.rb`: Upstream changes too close to glitch-soc MAX_CHARS changes, but not a real conflict. Applied upstream changes. - `package.json`: glitch-soc-only dependency textually too close to a dependency updated upstream, not a real conflict. Applied upstream changes.		2021-03-02 12:06:58 +01:00
..
activitypub	Merge branch 'main' into glitch-soc/merge-upstream	2021-02-12 10:28:32 +01:00
connection_pool
ostatus
proof_provider/keybase
rss
settings
delivery_failure_tracker_spec.rb
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
spam_check_spec.rb	Fix various warnings in rspec (#14729)	2020-09-04 20:22:26 +02:00
status_filter_spec.rb
status_finder_spec.rb
tag_manager_spec.rb
user_settings_decorator_spec.rb
webfinger_resource_spec.rb