Claire 29b5c5f483 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/models/custom_emoji.rb`: Slight refactor upstream, next to a line that was different in glitch-soc because of our local configurable limits on custom emoji size. Ported upstream changes. - `yarn.lock`: Not really a conflict, upstream dependency textually too close to a glitch-soc-only dependency. Updated upstream dependency as upstream.		2021-09-30 00:01:20 +02:00
..
activitypub	Merge branch 'main' into glitch-soc/merge-upstream	2021-09-14 13:50:30 +02:00
admin	…
connection_pool	…
nodeinfo	…
ostatus	…
proof_provider	…
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	Switch from unmaintained paperclip to kt-paperclip (#16724)	2021-09-29 23:52:36 +02:00
fast_ip_map.rb	…
feed_manager.rb	…
formatter.rb	…
hash_object.rb	…
inline_renderer.rb	…
language_detector.rb	…
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	…
proof_provider.rb	…
rate_limiter.rb	…
request.rb	…
request_pool.rb	…
response_with_limit.rb	…
rss_builder.rb	…
search_query_parser.rb	…
search_query_transformer.rb	…
sidekiq_error_handler.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	…