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 aaa9ec340b Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/lib/formatter.rb`: Upstream completely refactored the formatting code and removed that file, while glitch-soc had code for Markdown and HTML toots. Took upstream code, glitch-soc changes will be re-implemented on top of the refactored classes in a later commit. - `app/models/status.rb`: Upstream refactored status edit handling and moved code to `app/models/concerns/status_snapshot_concern.rb`. Applied glitch-soc's changes to that file. - `app/serializers/activitypub/note_serializer.rb`: Not really a conflict, just a line added too close to one modified by glitch-soc. Applied upstream changes while keeping the glitch-soc-modified one. - `app/services/update_status_service.rb`: Not really a conflict, upstream modified a line adjacent to one added by glitch-soc. Applied upstream changes while keeping the glitch-soc line. - `app/views/statuses/_simple_status.html.haml`: Upstream refactored formatting, glitch-soc changed the markup slightly. Applied upstream changes. - `spec/lib/formatter_spec.rb`: Upstream completely refactored the formatting code and removed that file, while glitch-soc had code for Markdown and HTML toots. Took upstream code, glitch-soc changes will be re-implemented on top of the refactored classes in a later commit.		3 years ago
..
activitypub	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
connection_pool	Add request pool to improve delivery performance (#10353)	5 years ago
ostatus	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	5 years ago
rss	Improve RSS entries for statuses (#13592)	5 years ago
settings	Add a test for Settings::Extend#settings (#5720)	7 years ago
delivery_failure_tracker_spec.rb	Change delivery failure tracking to work with hostnames instead of URLs (#13437)	5 years ago
emoji_formatter_spec.rb	Refactor formatter (#17828)	3 years ago
entity_cache_spec.rb	Fix cache_collection crashing when given an empty collection (#15921)	4 years ago
extractor_spec.rb	Spec Extractor (#3540)	8 years ago
fast_ip_map_spec.rb	Add IP-based rules (#14963)	4 years ago
feed_manager_spec.rb	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
hash_object_spec.rb	Spec HashObject (#3544)	8 years ago
html_aware_formatter.rb	Refactor formatter (#17828)	3 years ago
link_details_extractor_spec.rb	Add workaround for YouTube Shorts links (#17869)	3 years ago
permalink_redirector_spec.rb	Change routing paths to use usernames in web UI (#16171)	3 years ago
plain_text_formatter_spec.rb	Refactor formatter (#17828)	3 years ago
request_pool_spec.rb	Add request pool to improve delivery performance (#10353)	5 years ago
request_spec.rb	Fix connect timeout not being enforced (#9329)	6 years ago
sanitize_config_spec.rb	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
scope_transformer_spec.rb	Change authorized applications page (#17656)	3 years ago
status_filter_spec.rb	Record account suspend/silence time and keep track of domain blocks (#10660)	6 years ago
status_finder_spec.rb	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	5 years ago
status_reach_finder_spec.rb	Add support for editing for published statuses (#16697)	3 years ago
tag_manager_spec.rb	Spelling (#17705)	3 years ago
text_formatter_spec.rb	Refactor formatter (#17828)	3 years ago
user_settings_decorator_spec.rb	Enable updating additional account information from user preferences via rest api (#6789)	7 years ago
webfinger_resource_spec.rb	Fix webfinger returning wrong status code on malformed or missing param (#13759)	5 years ago