Claire 155dc4bc4b Merge commit '34cd7d6585992c03298c175ab5d22ad059b58cdb' into glitch-soc/merge-upstream ... Conflicts: - `CONTRIBUTING.md`: Upstream changed the file, while we had a different one. Updated the common parts. - `README.md`: Upstream changed the file, while we had a different one. Updated the common parts. - `app/helpers/application_helper.rb`: Upstream added helpers where glitch-soc had extra ones. Added upstream's new helpers. - `app/models/form/admin_settings.rb`: Upstream added some custom handling of one setting, while glitch-soc had additional code. Ported upstream's code. - `lib/mastodon/version.rb`: Upstream moved some things to `config/mastodon.yml`. Did the same. - `spec/requests/api/v1/accounts/credentials_spec.rb`: I don't know honestly.		2025-01-10 20:41:36 +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 '34cd7d6585992c03298c175ab5d22ad059b58cdb' into glitch-soc/merge-upstream	2025-01-10 20:41:36 +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