mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-16 11:53:13 +00:00
6c20dad201
Conflicts: - `README.md`: Upstream updated its README, while we have a completely different one. Kept our README. - `app/controllers/concerns/web_app_controller_concern.rb`: Conflict because of glitch-soc's theming system. Additionally, glitch-soc has different behavior regarding moved accounts. Ported some of the changes, but kept our overall behavior. - `app/javascript/packs/admin.js`: Code changes actually applied to `app/javascript/core/admin.js` |
||
|---|---|---|
| .. | ||
| 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 | ||