mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-15 09:56:47 +00: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. |
||
---|---|---|
.. | ||
admin | ||
keys | ||
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 | ||
featured_tag_serializer.rb | ||
filter_serializer.rb | ||
identity_proof_serializer.rb | ||
instance_serializer.rb | ||
list_serializer.rb | ||
marker_serializer.rb | ||
media_attachment_serializer.rb | ||
mute_serializer.rb | ||
notification_serializer.rb | ||
poll_serializer.rb | ||
preferences_serializer.rb | ||
preview_card_serializer.rb | ||
reaction_serializer.rb | ||
relationship_serializer.rb | ||
report_serializer.rb | ||
scheduled_status_serializer.rb | ||
search_serializer.rb | ||
status_serializer.rb | ||
tag_serializer.rb | ||
web_push_subscription_serializer.rb |