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

Conflicts:
- `app/views/layouts/mailer.html.haml`:
  Upstream removed a line close to one modified by glitch-soc.
  Removed the line as upstream did.

2023-01-14 22:34:09 +01:00

..

credentials_controller.rb

Allow changing hide_collections setting with the api (#22790)

2023-01-13 16:40:21 +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)

2022-08-28 03:45:07 +02:00

following_accounts_controller.rb

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

2022-08-28 03:45:07 +02:00

identity_proofs_controller.rb

Remove Keybase integration (#17045)

2021-11-26 05:58:18 +01:00

lists_controller.rb

Change REST API to return empty data for suspended accounts (#14765)

2020-09-11 15:16:29 +02:00

lookup_controller.rb

Fix error when looking handle with surrounding spaces (#18225)

2022-05-02 01:00:08 +02:00

notes_controller.rb

Add user notes on accounts (#14148)

2020-06-30 19:19:50 +02:00

pins_controller.rb

Make account endorsements idempotent (fix #19045) (#20118)

2022-11-08 16:39:15 +01:00

relationships_controller.rb

Do not filter out temporarily-suspended accounts from relationships API

2020-09-28 17:56:16 +02:00

search_controller.rb

Remove useless respond_to calls (#13208)

2020-03-06 01:29:38 +01:00

statuses_controller.rb

Fix performance of account timelines (#17709)

2022-03-08 09:14:39 +01:00