mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-15 19:33:32 +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. |
||
|---|---|---|
| .. | ||
| accept_follow_serializer.rb | ||
| activity_serializer.rb | ||
| actor_serializer.rb | ||
| add_serializer.rb | ||
| block_serializer.rb | ||
| collection_serializer.rb | ||
| delete_actor_serializer.rb | ||
| delete_serializer.rb | ||
| device_serializer.rb | ||
| emoji_serializer.rb | ||
| encrypted_message_serializer.rb | ||
| flag_serializer.rb | ||
| follow_serializer.rb | ||
| hashtag_serializer.rb | ||
| image_serializer.rb | ||
| like_serializer.rb | ||
| move_serializer.rb | ||
| note_serializer.rb | ||
| one_time_key_serializer.rb | ||
| outbox_serializer.rb | ||
| public_key_serializer.rb | ||
| reject_follow_serializer.rb | ||
| remove_serializer.rb | ||
| undo_announce_serializer.rb | ||
| undo_block_serializer.rb | ||
| undo_follow_serializer.rb | ||
| undo_like_serializer.rb | ||
| update_poll_serializer.rb | ||
| update_serializer.rb | ||
| vote_serializer.rb | ||