mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-17 04:13:01 +00:00
7635c67450
Conflicts: - `app/views/layouts/application.html.haml`: Upstream removed the `crossorigin` attribute from `preload_pack_asset`. Glitch-soc had different calls to `preload_pack_asset` because of the different theming system. Ported the change. - `app/views/layouts/embedded.html.haml`: Upstream removed the `crossorigin` attribute from `preload_pack_asset`. Glitch-soc had different calls to `preload_pack_asset` because of the different theming system. Ported the change. |
||
|---|---|---|
| .. | ||
| 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 | ||