Claire 5e11f3a6e1 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/styles/mastodon/modal.scss`: For some reason we changed the file loading path in glitch-soc, but now upstream has completely changed how the logo is loaded. Applied upstream changes.		2021-02-12 10:28:32 +01:00
..
activitypub	Merge branch 'main' into glitch-soc/merge-upstream	2021-02-12 10:28:32 +01:00
connection_pool	…
nodeinfo	…
ostatus	…
proof_provider	…
rss	…
settings	Merge branch 'master' into glitch-soc/merge-upstream	2021-01-18 13:57:12 +01:00
access_token_extension.rb	Fix streaming API allowing connections to persist after access token invalidation (#15111)	2020-11-12 23:05:24 +01:00
activity_tracker.rb	…
application_extension.rb	…
cache_buster.rb	Add cache buster feature for media files (#15155)	2020-11-19 17:38:06 +01:00
delivery_failure_tracker.rb	…
entity_cache.rb	Use Rails' index_by where it makes sense (#15542)	2021-01-12 09:27:38 +01:00
exceptions.rb	…
extractor.rb	Optimize some regex matching (#15528)	2021-01-22 10:09:08 +01:00
fast_geometry_parser.rb	…
fast_ip_map.rb	…
feed_manager.rb	Merge branch 'main' into glitch-soc/merge-upstream	2021-01-26 14:01:30 +01:00
formatter.rb	Merge branch 'main' into glitch-soc/merge-upstream	2021-01-26 14:01:30 +01:00
hash_object.rb	…
inline_renderer.rb	…
language_detector.rb	…
potential_friendship_tracker.rb	…
proof_provider.rb	…
rate_limiter.rb	…
request.rb	Optimize some regex matching (#15528)	2021-01-22 10:09:08 +01:00
request_pool.rb	…
response_with_limit.rb	…
rss_builder.rb	…
sanitize_config.rb	Merge branch 'main' into glitch-soc/merge-upstream	2021-01-26 14:01:30 +01:00
search_query_parser.rb	…
search_query_transformer.rb	…
sidekiq_error_handler.rb	…
spam_check.rb	Use Enumerable#filter_map in more places (#15527)	2021-01-22 16:28:15 +01:00
status_filter.rb	…
status_finder.rb	…
status_reach_finder.rb	Fix deletes not reaching every server that interacted with status (#15200)	2020-11-27 15:48:31 +01:00
tag_manager.rb	…
themes.rb	…
toc_generator.rb	…
user_settings_decorator.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-10-21 19:10:50 +02:00
webfinger.rb	Onion service related changes to HTTPS handling (#15560)	2021-02-11 04:40:13 +01:00
webfinger_resource.rb	…