luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-02 13:04:37 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/serializers/rest
History
Claire 24e83246f9 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/status.rb`:
  Upstream updated media and edit-related code textually close to glitch-soc
  additions (local-only and content-type).
  Ported upstream changes.
- `app/models/status_edit.rb`:
  Upstream changes textually close to glitch-soc additions (content-type).
  Ported upstream changes.
- `app/serializers/activitypub/note_serializer.rb`:
  Upstream changed how media attachments are handled. Not really a conflict,
  but textually close to glitch-soc additions (directMessage attribute).
  Ported upstream changes.
- `app/services/remove_status_service.rb`:
  Upstream changed how media attachments are handled. Not really a conflict,
  but textually close to glitch-soc additions (DM timeline).
  Ported upstream changes.
- `app/services/update_status_service.rb`:
  Upstream fixed an issue with language selection. Not really a conflict,
  but textually close to glitch-soc additions (content-type).
  Ported upstream changes.
- `db/schema.rb`:
  Upstream added columns to the `status_edits` table, the conflict is because
  of an additional column (`content-type`) in glitch-soc.
  Ported upstream changes.
- `package.json`:
  Upstream dependency (express) textually adjacent to a glitch-soc-specific one
  (favico.js) got updated.
  Updated it as well.
2022-03-10 09:52:45 +01:00
..
admin Change design of federation pages in admin UI (#17704) 2022-03-09 08:52:32 +01:00
keys
trends Add trending links (#16917) 2021-11-25 13:07:38 +01:00
account_serializer.rb Merge branch 'main' into glitch-soc/merge-upstream 2021-05-09 10:41:28 +02:00
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 Add /api/v1/accounts/familiar_followers to REST API (#17700) 2022-03-07 09:36:47 +01:00
featured_tag_serializer.rb
filter_serializer.rb
instance_serializer.rb Merge branch 'main' into glitch-soc/merge-upstream 2021-07-11 21:41:23 +02:00
list_serializer.rb Add backend support to read and update list-specific show_replies settings 2018-11-28 14:46:07 +01:00
marker_serializer.rb Add timeline read markers API (#11762) 2019-09-06 13:55:51 +02:00
media_attachment_serializer.rb Stop setting a shortcode to newly-created media attachments (#16730) 2021-09-13 18:59:37 +02:00
mute_serializer.rb
muted_account_serializer.rb
notification_serializer.rb Add notifications when a reblogged status has been updated (#17404) 2022-02-11 22:20:19 +01:00
poll_serializer.rb
preferences_serializer.rb
preview_card_serializer.rb Add blurhash to preview cards (#13984) 2020-06-05 23:10:41 +02:00
reaction_serializer.rb
relationship_serializer.rb Add option to be notified when a followed user posts (#13546) 2020-09-18 17:26:45 +02:00
report_serializer.rb
rule_serializer.rb
scheduled_status_serializer.rb Fix wrong param name in scheduled statuses and return params in API (#9725) 2019-01-06 12:03:27 +01:00
search_serializer.rb
status_edit_serializer.rb Change how changes to media attachments are stored for edits (#17696) 2022-03-09 09:06:17 +01:00
status_serializer.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-03-10 09:52:45 +01:00
status_source_serializer.rb Add content-type to status source in glitch-soc 2022-01-20 00:03:44 +01:00
suggestion_serializer.rb Add cold-start follow recommendations (#15945) 2021-04-12 12:37:14 +02:00
tag_serializer.rb
web_push_subscription_serializer.rb