mirror of
https://framagit.org/tykayn/mastodon.git
synced 2023-08-25 08:33:12 +02:00
aaa9ec340b
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. |
||
---|---|---|
.. | ||
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 |