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	Fix SidekiqProcessCheck checking for a queue name that isn't used in Mastodon (#16002)	2021-04-05 23:41:37 +02:00
connection_pool
nodeinfo
ostatus
proof_provider
rss
settings	Merge branch 'main' into glitch-soc/merge-upstream	2021-03-24 10:53:50 +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
account_reach_finder.rb	Fix remote reporters not receiving suspend/unsuspend activities (#16050)	2021-04-17 14:55:46 +02:00
activity_tracker.rb
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	Update twitter-text from 1.14 to 3.1.0 and fix toot character counting (#15382)	2021-03-02 12:02:56 +01:00
fast_geometry_parser.rb	Switch from unmaintained paperclip to kt-paperclip (#16724)	2021-09-29 23:52:36 +02:00
fast_ip_map.rb	Add IP-based rules (#14963)	2020-10-12 16:33:49 +02:00
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
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
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
search_query_parser.rb
search_query_transformer.rb
sidekiq_error_handler.rb	Bump rubocop from 0.86.0 to 0.88.0 (#14412)	2020-09-01 03:04:00 +02:00
status_filter.rb
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
toc_generator.rb
user_settings_decorator.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-10-21 19:10:50 +02:00
validation_error_formatter.rb	Add details to error response for POST /api/v1/accounts in REST API (#15803)	2021-03-01 04:59:13 +01:00
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	replace all instances of "ends_with?" with "end_with?" (#15745)	2021-02-19 09:56:14 +01:00
webfinger_resource.rb