mirror of
https://framagit.org/tykayn/mastodon.git
synced 2023-08-25 08:33:12 +02:00
![]() Conflicts: - `app/lib/formatter.rb`: Upstream completely refactored the formatting code and removed that file, while glitch-soc had code for Markdown and HTML toots. Took upstream code, glitch-soc changes will be re-implemented on top of the refactored classes in a later commit. - `app/models/status.rb`: Upstream refactored status edit handling and moved code to `app/models/concerns/status_snapshot_concern.rb`. Applied glitch-soc's changes to that file. - `app/serializers/activitypub/note_serializer.rb`: Not really a conflict, just a line added too close to one modified by glitch-soc. Applied upstream changes while keeping the glitch-soc-modified one. - `app/services/update_status_service.rb`: Not really a conflict, upstream modified a line adjacent to one added by glitch-soc. Applied upstream changes while keeping the glitch-soc line. - `app/views/statuses/_simple_status.html.haml`: Upstream refactored formatting, glitch-soc changed the markup slightly. Applied upstream changes. - `spec/lib/formatter_spec.rb`: Upstream completely refactored the formatting code and removed that file, while glitch-soc had code for Markdown and HTML toots. Took upstream code, glitch-soc changes will be re-implemented on top of the refactored classes in a later commit. |
||
---|---|---|
.. | ||
admin | ||
keys | ||
trends | ||
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_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 | ||
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 | ||
web_push_subscription_serializer.rb |