mastodon-glitch/app/serializers
Claire 0aa69487a2 Merge commit '877090518682b6c77ba9bdfa0231afd56daec44d' into glitch-soc/merge-upstream
Conflicts:
- `app/models/concerns/user/has_settings.rb`:
  Not a real conflict, upstream added a setting textually close to a glitch-soc one.
  Added upstream's new setting.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Not a real conflict, upstream added a setting textually close to a glitch-soc one.
  Added upstream's new setting.
- `config/routes.rb`:
  Upstream moved web app routes to `config/routes/web_app.rb`, while glitch-soc had
  an extra route.
  Moved the extra route to `config/routes/web_app.rb`.
- `spec/controllers/settings/preferences/appearance_controller_spec.rb`:
  This spec got converted to a system spec upstream.
  However, the theme setting works differently in glitch-soc, so the spec had been
  changed.
  Changed the corresponding system spec as well.
2024-12-25 18:01:37 +01:00
..
activitypub Merge commit '5dfdec645313e556413147597138a8008bc35996' into glitch-soc/merge-upstream 2024-09-23 20:24:18 +02:00
node_info nodeinfo: add instance name and description (#28079) 2023-11-28 00:51:22 +00:00
rest Merge commit '877090518682b6c77ba9bdfa0231afd56daec44d' into glitch-soc/merge-upstream 2024-12-25 18:01:37 +01: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 '877090518682b6c77ba9bdfa0231afd56daec44d' into glitch-soc/merge-upstream 2024-12-25 18:01:37 +01:00
manifest_serializer.rb Prefer native apps over PWA (#27254) 2024-10-07 20:33:14 +00:00
oauth_metadata_serializer.rb Add userinfo oauth endpoint (#32548) 2024-10-30 14:38:10 +00:00
oauth_userinfo_serializer.rb Add userinfo oauth endpoint (#32548) 2024-10-30 14:38:10 +00:00
oembed_serializer.rb Use heredoc/squish for inline css styles in oembed serializer (#31991) 2024-09-20 12:50:51 +00:00
webfinger_serializer.rb Add avatar image to webfinger responses (#26558) 2023-08-31 13:46:27 +02:00