Claire 24e83246f9 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/models/status.rb`: Upstream updated media and edit-related code textually close to glitch-soc additions (local-only and content-type). Ported upstream changes. - `app/models/status_edit.rb`: Upstream changes textually close to glitch-soc additions (content-type). Ported upstream changes. - `app/serializers/activitypub/note_serializer.rb`: Upstream changed how media attachments are handled. Not really a conflict, but textually close to glitch-soc additions (directMessage attribute). Ported upstream changes. - `app/services/remove_status_service.rb`: Upstream changed how media attachments are handled. Not really a conflict, but textually close to glitch-soc additions (DM timeline). Ported upstream changes. - `app/services/update_status_service.rb`: Upstream fixed an issue with language selection. Not really a conflict, but textually close to glitch-soc additions (content-type). Ported upstream changes. - `db/schema.rb`: Upstream added columns to the `status_edits` table, the conflict is because of an additional column (`content-type`) in glitch-soc. Ported upstream changes. - `package.json`: Upstream dependency (express) textually adjacent to a glitch-soc-specific one (favico.js) got updated. Updated it as well.		2022-03-10 09:52:45 +01:00
..
activitypub
admin
connection_pool
nodeinfo
ostatus
rss
settings
access_token_extension.rb
account_reach_finder.rb
activity_tracker.rb
application_extension.rb
cache_buster.rb
delivery_failure_tracker.rb
entity_cache.rb
extractor.rb
fast_geometry_parser.rb
fast_ip_map.rb
feed_manager.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-03-10 09:52:45 +01:00
formatter.rb
hash_object.rb
inline_renderer.rb
link_details_extractor.rb
permalink_redirector.rb
potential_friendship_tracker.rb
rate_limiter.rb
request.rb
request_pool.rb
response_with_limit.rb
rss_builder.rb
scope_parser.rb
scope_transformer.rb
search_query_parser.rb
search_query_transformer.rb
status_filter.rb
status_finder.rb
status_reach_finder.rb
tag_manager.rb
themes.rb
toc_generator.rb
user_settings_decorator.rb
validation_error_formatter.rb
video_metadata_extractor.rb
webfinger.rb
webfinger_resource.rb