mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-09-28 04:49:11 +00:00
7452a95998
Conflicts: - `.github/dependabot.yml`: Upstream made changes while we have dropped this file. Keep the file deleted. - `.prettierignore`: Upstream made changes at the end of the file, where we had our extra lines. Just moved our extra lines back at the end. - `app/serializers/initial_state_serializer.rb`: Upstream code style changes. Applied them. - `app/services/backup_service.rb`: Upstream code style changes. Applied them. |
||
---|---|---|
.. | ||
activitypub | ||
connection_pool | ||
ostatus | ||
settings | ||
vacuum | ||
advanced_text_formatter_spec.rb | ||
delivery_failure_tracker_spec.rb | ||
emoji_formatter_spec.rb | ||
entity_cache_spec.rb | ||
extractor_spec.rb | ||
fast_ip_map_spec.rb | ||
feed_manager_spec.rb | ||
hash_object_spec.rb | ||
hashtag_normalizer_spec.rb | ||
html_aware_formatter_spec.rb | ||
link_details_extractor_spec.rb | ||
permalink_redirector_spec.rb | ||
plain_text_formatter_spec.rb | ||
request_pool_spec.rb | ||
request_spec.rb | ||
sanitize_config_spec.rb | ||
scope_transformer_spec.rb | ||
status_cache_hydrator_spec.rb | ||
status_filter_spec.rb | ||
status_finder_spec.rb | ||
status_reach_finder_spec.rb | ||
suspicious_sign_in_detector_spec.rb | ||
tag_manager_spec.rb | ||
text_formatter_spec.rb | ||
user_settings_decorator_spec.rb | ||
webfinger_resource_spec.rb |