mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-24 14:17:08 +00:00
178e151019
Conflicts: - `app/models/user_settings.rb`: Upstream added a constraint on a setting textually close to glitch-soc-only settings. Applied upstream's change. - `lib/sanitize_ext/sanitize_config.rb`: Upstream added support for the `translate` attribute on a few elements, where glitch-soc had a different set of allowed elements and attributes. Extended glitch-soc's allowed attributes with `translate` as upstream did. - `spec/validators/status_length_validator_spec.rb`: Upstream refactored to use RSpec's `instance_double` instead of `double`, but glitch-soc had changes to tests due to configurable max toot chars. Applied upstream's changes while keeping tests against configurable max toot chars. |
||
---|---|---|
.. | ||
activitypub | ||
admin | ||
connection_pool | ||
importer | ||
mastodon | ||
ostatus | ||
translation_service | ||
vacuum | ||
webhooks | ||
account_reach_finder_spec.rb | ||
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 | ||
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 |