mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-08 07:55:14 +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. |
||
|---|---|---|
| .. | ||
| admin | ||
| concerns | ||
| trends | ||
| web | ||
| account_alias_spec.rb | ||
| account_conversation_spec.rb | ||
| account_deletion_request_spec.rb | ||
| account_domain_block_spec.rb | ||
| account_filter_spec.rb | ||
| account_migration_spec.rb | ||
| account_moderation_note_spec.rb | ||
| account_spec.rb | ||
| account_statuses_cleanup_policy_spec.rb | ||
| account_statuses_filter_spec.rb | ||
| announcement_mute_spec.rb | ||
| announcement_reaction_spec.rb | ||
| announcement_spec.rb | ||
| appeal_spec.rb | ||
| backup_spec.rb | ||
| block_spec.rb | ||
| canonical_email_block_spec.rb | ||
| conversation_mute_spec.rb | ||
| conversation_spec.rb | ||
| custom_emoji_category_spec.rb | ||
| custom_emoji_filter_spec.rb | ||
| custom_emoji_spec.rb | ||
| custom_filter_keyword_spec.rb | ||
| custom_filter_spec.rb | ||
| device_spec.rb | ||
| domain_allow_spec.rb | ||
| domain_block_spec.rb | ||
| email_domain_block_spec.rb | ||
| encrypted_message_spec.rb | ||
| export_spec.rb | ||
| favourite_spec.rb | ||
| featured_tag_spec.rb | ||
| follow_recommendation_suppression_spec.rb | ||
| follow_request_spec.rb | ||
| follow_spec.rb | ||
| home_feed_spec.rb | ||
| identity_spec.rb | ||
| import_spec.rb | ||
| invite_spec.rb | ||
| ip_block_spec.rb | ||
| list_account_spec.rb | ||
| list_spec.rb | ||
| login_activity_spec.rb | ||
| marker_spec.rb | ||
| media_attachment_spec.rb | ||
| mention_spec.rb | ||
| mute_spec.rb | ||
| notification_spec.rb | ||
| one_time_key_spec.rb | ||
| poll_spec.rb | ||
| poll_vote_spec.rb | ||
| preview_card_spec.rb | ||
| public_feed_spec.rb | ||
| relationship_filter_spec.rb | ||
| relay_spec.rb | ||
| remote_follow_spec.rb | ||
| report_filter_spec.rb | ||
| report_spec.rb | ||
| rule_spec.rb | ||
| scheduled_status_spec.rb | ||
| session_activation_spec.rb | ||
| setting_spec.rb | ||
| site_upload_spec.rb | ||
| status_edit_spec.rb | ||
| status_pin_spec.rb | ||
| status_spec.rb | ||
| status_stat_spec.rb | ||
| system_key_spec.rb | ||
| tag_feed_spec.rb | ||
| tag_follow_spec.rb | ||
| tag_spec.rb | ||
| unavailable_domain_spec.rb | ||
| user_invite_request_spec.rb | ||
| user_role_spec.rb | ||
| user_spec.rb | ||
| webauthn_credentials_spec.rb | ||
| webhook_spec.rb | ||