86c9c5afa0
Conflicts: - `app/controllers/concerns/web_app_controller_concern.rb`: Upstream changed the order of Action Controller filters for web app controllers. Glitch-soc has an extra filter due to its theming system. Changed the order accordingly. - `app/views/settings/preferences/appearance/show.html.haml`: Conflict due to an extra newline in glitch-soc. Removed that newline and applied upstream's changes. |
||
|---|---|---|
| .. | ||
| activitypub | ||
| admin | ||
| connection_pool | ||
| importer | ||
| mastodon | ||
| ostatus | ||
| translation_service | ||
| vacuum | ||
| webhooks | ||
| account_reach_finder_spec.rb | ||
| account_statuses_filter_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_parser_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 | ||