mastodon

mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00

History

Claire c118918520 Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `app/models/custom_emoji.rb`:
  Not a real conflict, just upstream changing a line too close to
  a glitch-soc-specific validation.
  Applied upstream changes.
- `app/models/public_feed.rb`:
  Not a real conflict, just upstream changing a line too close to
  a glitch-soc-specific parameter documentation.
  Applied upstream changes.

2022-11-10 09:36:47 +01:00

credentials_controller.rb

make it not return http 400 when passing and empty source argument (#12259 )

2019-11-16 19:02:09 +01:00

familiar_followers_controller.rb

Add /api/v1/accounts/familiar_followers to REST API (#17700 )

2022-03-07 09:36:47 +01:00

featured_tags_controller.rb

Use existing FeaturedTag serializer and delete AccountFeaturedTag serializer (#15415 )

2020-12-23 16:43:38 +01:00

follower_accounts_controller.rb

Change following and followers API to be accessible without being logged in (#18964 )