mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-09-16 07:00:57 +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 | ||
| concerns | ||
| keys | ||
| account_search_service.rb | ||
| account_statuses_cleanup_service.rb | ||
| after_block_domain_from_account_service.rb | ||
| after_block_service.rb | ||
| after_unallow_domain_service.rb | ||
| app_sign_up_service.rb | ||
| appeal_service.rb | ||
| approve_appeal_service.rb | ||
| authorize_follow_service.rb | ||
| backup_service.rb | ||
| base_service.rb | ||
| batched_remove_status_service.rb | ||
| block_domain_service.rb | ||
| block_service.rb | ||
| bootstrap_timeline_service.rb | ||
| clear_domain_media_service.rb | ||
| delete_account_service.rb | ||
| deliver_to_device_service.rb | ||
| fan_out_on_write_service.rb | ||
| favourite_service.rb | ||
| fetch_link_card_service.rb | ||
| fetch_oembed_service.rb | ||
| fetch_remote_status_service.rb | ||
| fetch_resource_service.rb | ||
| follow_service.rb | ||
| import_service.rb | ||
| move_service.rb | ||
| mute_service.rb | ||
| notify_service.rb | ||
| post_status_service.rb | ||
| precompute_feed_service.rb | ||
| process_hashtags_service.rb | ||
| process_mentions_service.rb | ||
| purge_domain_service.rb | ||
| reblog_service.rb | ||
| reject_follow_service.rb | ||
| remove_from_followers_service.rb | ||
| remove_status_service.rb | ||
| report_service.rb | ||
| resolve_account_service.rb | ||
| resolve_url_service.rb | ||
| search_service.rb | ||
| suspend_account_service.rb | ||
| tag_search_service.rb | ||
| translate_status_service.rb | ||
| unallow_domain_service.rb | ||
| unblock_domain_service.rb | ||
| unblock_service.rb | ||
| unfavourite_service.rb | ||
| unfollow_service.rb | ||
| unmute_service.rb | ||
| unsuspend_account_service.rb | ||
| update_account_service.rb | ||
| update_status_service.rb | ||
| verify_link_service.rb | ||
| vote_service.rb | ||
| webhook_service.rb | ||