mirror of
https://github.com/funamitech/mastodon
synced 2024-12-13 14:18:34 +09: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 | ||
keys | ||
trends | ||
v1 | ||
account_serializer.rb | ||
announcement_serializer.rb | ||
application_serializer.rb | ||
context_serializer.rb | ||
conversation_serializer.rb | ||
credential_account_serializer.rb | ||
custom_emoji_serializer.rb | ||
encrypted_message_serializer.rb | ||
familiar_followers_serializer.rb | ||
featured_tag_serializer.rb | ||
filter_keyword_serializer.rb | ||
filter_result_serializer.rb | ||
filter_serializer.rb | ||
filter_status_serializer.rb | ||
instance_serializer.rb | ||
list_serializer.rb | ||
marker_serializer.rb | ||
media_attachment_serializer.rb | ||
mute_serializer.rb | ||
muted_account_serializer.rb | ||
notification_serializer.rb | ||
poll_serializer.rb | ||
preferences_serializer.rb | ||
preview_card_serializer.rb | ||
reaction_serializer.rb | ||
relationship_serializer.rb | ||
report_serializer.rb | ||
role_serializer.rb | ||
rule_serializer.rb | ||
scheduled_status_serializer.rb | ||
search_serializer.rb | ||
status_edit_serializer.rb | ||
status_serializer.rb | ||
status_source_serializer.rb | ||
suggestion_serializer.rb | ||
tag_serializer.rb | ||
translation_serializer.rb | ||
web_push_subscription_serializer.rb |