1
0
puyopuyotetr.is/app/serializers
Claire 1d1c3a808a Merge commit '6c381f20b1d52c96525cbd5c41b0c972c3394a48' into glitch-soc/merge-upstream
Conflicts:
- `app/models/user_settings.rb`:
  Upstream removed a setting textually adjacent to a glitch-soc-only setting.
  Removed the setting glitch-soc removed.
2024-04-06 21:01:40 +02:00
..
activitypub Merge commit '272592d16d40e804ec325ef3b5e6de9bbad5f2dd' into glitch-soc/merge-upstream 2023-12-20 22:05:31 +01:00
node_info nodeinfo: add instance name and description (#28079) 2023-11-28 00:51:22 +00:00
rest Merge commit '119c7aa0df1e1d26bdee1701250d23a7af9e9136' into glitch-soc/merge-upstream 2024-04-06 20:34:07 +02:00
web Update dependency rubocop-rails to v2.20.1 (#25493) 2023-07-13 11:44:02 +02:00
initial_state_serializer.rb Merge commit '6c381f20b1d52c96525cbd5c41b0c972c3394a48' into glitch-soc/merge-upstream 2024-04-06 21:01:40 +02:00
manifest_serializer.rb Use a helper to avoid using media/ asset prefixes (#28756) 2024-01-17 12:19:51 +00:00
oembed_serializer.rb Improve RSS entries for statuses (#13592) 2020-05-10 09:50:54 +02:00
webfinger_serializer.rb Add avatar image to webfinger responses (#26558) 2023-08-31 13:46:27 +02:00