mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-22 13:17:13 +00:00
221580a3af
Conflicts: - `app/controllers/home_controller.rb`: Upstream made it so `/web` is available to non-logged-in users and `/` redirects to `/web` instead of `/about`. Kept our version since glitch-soc's WebUI doesn't have what's needed yet and I think /about is still a much better landing page anyway. - `app/models/form/admin_settings.rb`: Upstream added new settings, and glitch-soc had an extra setting. Not really a conflict. Added upstream's new settings. - `app/serializers/initial_state_serializer.rb`: Upstream added a new `server` initial state object. Not really a conflict. Merged upstream's changes. - `app/views/admin/settings/edit.html.haml`: Upstream added new settings. Not really a conflict. Merged upstream's changes. - `app/workers/scheduler/feed_cleanup_scheduler.rb`: Upstream refactored that part and removed the file. Ported our relevant changes into `app/lib/vacuum/feeds_vacuum.rb` - `config/settings.yml`: Upstream added new settings. Not a real conflict. Added upstream's new settings. |
||
|---|---|---|
| .. | ||
| activitypub | ||
| admin | ||
| connection_pool | ||
| importer | ||
| nodeinfo | ||
| ostatus | ||
| rss | ||
| settings | ||
| translation_service | ||
| vacuum | ||
| access_token_extension.rb | ||
| account_reach_finder.rb | ||
| activity_tracker.rb | ||
| advanced_text_formatter.rb | ||
| application_extension.rb | ||
| ascii_folding.rb | ||
| cache_buster.rb | ||
| delivery_failure_tracker.rb | ||
| emoji_formatter.rb | ||
| entity_cache.rb | ||
| extractor.rb | ||
| fast_geometry_parser.rb | ||
| fast_ip_map.rb | ||
| feed_manager.rb | ||
| hash_object.rb | ||
| hashtag_normalizer.rb | ||
| html_aware_formatter.rb | ||
| inline_renderer.rb | ||
| link_details_extractor.rb | ||
| permalink_redirector.rb | ||
| plain_text_formatter.rb | ||
| potential_friendship_tracker.rb | ||
| rate_limiter.rb | ||
| redis_configuration.rb | ||
| request.rb | ||
| request_pool.rb | ||
| response_with_limit.rb | ||
| scope_parser.rb | ||
| scope_transformer.rb | ||
| search_query_parser.rb | ||
| search_query_transformer.rb | ||
| status_filter.rb | ||
| status_finder.rb | ||
| status_reach_finder.rb | ||
| suspicious_sign_in_detector.rb | ||
| tag_manager.rb | ||
| text_formatter.rb | ||
| themes.rb | ||
| toc_generator.rb | ||
| translation_service.rb | ||
| user_settings_decorator.rb | ||
| vacuum.rb | ||
| validation_error_formatter.rb | ||
| video_metadata_extractor.rb | ||
| webfinger.rb | ||
| webfinger_resource.rb | ||