mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-13 22:55:07 +01:00
12c8ac9e14
Conflicts: - `app/controllers/activitypub/collections_controller.rb`: Conflict due to glitch-soc having to take care of local-only pinned toots in that controller. Took upstream's changes and restored the local-only special handling. - `app/controllers/auth/sessions_controller.rb`: Minor conflicts due to the theming system, applied upstream changes, adapted the following two files for glitch-soc's theming system: - `app/controllers/concerns/sign_in_token_authentication_concern.rb` - `app/controllers/concerns/two_factor_authentication_concern.rb` - `app/services/backup_service.rb`: Minor conflict due to glitch-soc having to handle local-only toots specially. Applied upstream changes and restored the local-only special handling. - `app/views/admin/custom_emojis/index.html.haml`: Minor conflict due to the theming system. - `package.json`: Upstream dependency updated, too close to a glitch-soc-only dependency in the file. - `yarn.lock`: Upstream dependency updated, too close to a glitch-soc-only dependency in the file. |
||
---|---|---|
.. | ||
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 | ||
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 |