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 e2a2bc9021 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream updated copyright year, we don't mention it so kept our version. - `app/controllers/admin/dashboard_controller.rb`: Not really a conflict, upstream change (removing the spam checker) too close to glitch-soc changes. Ported upstream changes. - `app/models/form/admin_settings.rb`: Same. - `app/services/remove_status_service.rb`: Same. - `app/views/admin/settings/edit.html.haml`: Same. - `config/settings.yml`: Same. - `config/environments/production.rb`: Not a real conflict, upstream added a default HTTP header, but we have extra headers in glitch-soc. Added the header.		4 years ago
..
activitypub	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
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)	4 years ago
extractor_spec.rb	…
fast_ip_map_spec.rb	…
feed_manager_spec.rb	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
formatter_spec.rb	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
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	4 years ago
status_filter_spec.rb	…
status_finder_spec.rb	…
tag_manager_spec.rb	Change multiple mentions with same username to render with domain (#15718)	4 years ago
user_settings_decorator_spec.rb	…
webfinger_resource_spec.rb	…