Claire 2d4b4b0b45 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/accounts_controller.rb`: Upstream introduced support for private pinned toots, but glitch-soc's query was a bit different as it filtered out local-only toots. Used upstream's query, while adding local-only filtering back. - `app/controllers/activitypub/collections_controller.rb`: Same thing with regards to local-only posts. - `app/validators/status_pin_validator.rb`: Not a real conflict, but the line below was different in glitch-soc due to the configurable pinned toots limit.		2022-01-17 08:28:52 +01:00
..
activitypub	Merge branch 'main' into glitch-soc/merge-upstream	2022-01-17 08:28:52 +01:00
admin	Fix server graph on admin/tags/:id (#17066)	2021-11-28 23:13:07 +01:00
connection_pool
nodeinfo
ostatus
rss
settings	Merge branch 'main' into glitch-soc/merge-upstream	2021-03-24 10:53:50 +01:00
access_token_extension.rb
account_reach_finder.rb	Fix remote reporters not receiving suspend/unsuspend activities (#16050)	2021-04-17 14:55:46 +02:00
activity_tracker.rb	Add graphs and retention metrics to admin dashboard (#16829)	2021-10-14 20:44:59 +02:00
application_extension.rb	Fix app name, website and redirect URIs not having a maximum length (#16042)	2021-04-15 16:28:43 +02:00
cache_buster.rb	Add cache buster feature for media files (#15155)	2020-11-19 17:38:06 +01:00
delivery_failure_tracker.rb	Add management of delivery availability in Federation settings (#15771)	2021-05-05 23:39:02 +02:00
entity_cache.rb	Fix cache_collection crashing when given an empty collection (#15921)	2021-03-18 00:41:32 +01:00
extractor.rb
fast_geometry_parser.rb	Switch from unmaintained paperclip to kt-paperclip (#16724)	2021-09-29 23:52:36 +02:00
fast_ip_map.rb
feed_manager.rb	Merge branch 'main' into glitch-soc/merge-upstream	2021-05-10 21:45:32 +02:00
formatter.rb	Merge branch 'main' into glitch-soc/merge-upstream	2021-07-17 17:45:35 +02:00
hash_object.rb
inline_renderer.rb
language_detector.rb	Fix URL scanning in note length validator and preview card fetching (#15827)	2021-03-04 00:12:26 +01:00
link_details_extractor.rb	Add trending links (#16917)	2021-11-25 13:07:38 +01:00
permalink_redirector.rb	Change routing paths to use usernames in web UI (#16171)	2021-09-26 05:46:13 +02:00
potential_friendship_tracker.rb	Change auto-following admin-selected accounts, show in recommendations (#16078)	2021-04-24 17:01:43 +02:00
rate_limiter.rb
request.rb	Add support for structured data and more OpenGraph tags to link cards (#16938)	2021-11-05 23:23:05 +01:00
request_pool.rb	Add request pool to improve delivery performance (#10353)	2019-07-02 00:34:38 +02:00
response_with_limit.rb	Fix remote files not using Content-Type header, streaming (#14184)	2020-06-30 23:58:02 +02:00
rss_builder.rb
search_query_parser.rb
search_query_transformer.rb
status_filter.rb	Fix n+1 queries in StatusThreadingConcern (#7321)	2018-05-03 10:41:58 +02:00
status_finder.rb
status_reach_finder.rb	Fix nil error when removing status caused by race condition (#16099)	2021-04-24 13:35:39 +02:00
tag_manager.rb	Merge branch 'main' into glitch-soc/merge-upstream	2021-04-20 12:17:14 +02:00
themes.rb	Allow selecting both default flavour and theme	2018-10-12 19:06:35 +02:00
toc_generator.rb	Add fallback section ID with ToC (#11941)	2019-09-23 17:25:10 +02:00
user_settings_decorator.rb
validation_error_formatter.rb
video_metadata_extractor.rb	Fix media processing getting stuck on too much stdin/stderr (#16136)	2021-05-05 19:44:01 +02:00
webfinger.rb	Fix confusing error when webfinger request returns empty document (#16986)	2021-11-14 21:55:40 +01:00
webfinger_resource.rb	Fix webfinger returning wrong status code on malformed or missing param (#13759)	2020-05-14 23:28:06 +02:00