mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-26 15:16:47 +00:00
296b3d1560
Conflicts: - `.rubocop_todo.yml`: Upstream re-generated the file, while glitch-soc has a specific ignore for some file. Updated the file as upstream did and kept our extra ignore. - `config/webpack/shared.js`: Upstream added a plugin, but our files are pretty different. Added the plugin as well. - `spec/helpers/application_helper_spec.rb`: Upstream refactored tests, but part of them were different because of glitch-soc's theming system. Applied the refactoring to glitch-soc's change. |
||
---|---|---|
.. | ||
activitypub | ||
admin | ||
connection_pool | ||
importer | ||
mastodon | ||
ostatus | ||
translation_service | ||
vacuum | ||
webhooks | ||
account_reach_finder_spec.rb | ||
advanced_text_formatter_spec.rb | ||
cache_buster_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 | ||
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 | ||
search_query_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 | ||
webfinger_resource_spec.rb |