Claire 1fbd1fa5c4 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/settings/preferences_controller.rb`: Conflicts due to us having more user settings and upstream dropping `hide_network` (to replace it with an account attribute, properly migrated). Dropped `hide_network` like upstream. - `app/lib/user_settings_decorator.rb`: Conflicts due to us having more user settings and upstream dropping `hide_network` (to replace it with an account attribute, properly migrated). Dropped `hide_network` like upstream. - `app/models/status.rb`: Conflict because of slight change in how glitch-soc handles the scope to filter out local-only posts for anonymous viewers. Took upstream's changes and re-applied glitch-soc's change. - `app/models/user.rb`: Conflicts due to us having more user settings and upstream dropping `hide_network` (to replace it with an account attribute, properly migrated). Dropped `hide_network` like upstream. - `app/views/directories/index.html.haml`: Conflict because upstream redesigned that page while glitch-soc had a minor change to support hiding the number of followers. Ported glitch-soc's change on top of upstream's redesign. Additional changes: - `app/models/account_statuses_filter.rb`: See change to `app/models/status.rb`.		2022-03-08 20:22:54 +01:00
..
activitypub	Merge branch 'main' into glitch-soc/merge-upstream	2022-02-17 10:58:44 +01:00
connection_pool
ostatus	Remove Atom feeds and old URLs in the form of GET /:username/updates/:id (#11247)	2019-07-07 16:16:51 +02:00
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	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
link_details_extractor_spec.rb	Fix structured data parsing from links choking on bad data (#17403)	2022-02-07 18:16:31 +01:00
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
scope_transformer_spec.rb	Change authorized applications page (#17656)	2022-03-01 16:48:58 +01:00
status_filter_spec.rb
status_finder_spec.rb
status_reach_finder_spec.rb	Add support for editing for published statuses (#16697)	2022-01-19 22:37:27 +01:00
tag_manager_spec.rb	Spelling (#17705)	2022-03-06 22:51:40 +01:00
user_settings_decorator_spec.rb
webfinger_resource_spec.rb