mastodon/app/controllers/api/v1/accounts
Claire 221580a3af Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/home_controller.rb`:
  Upstream made it so `/web` is available to non-logged-in users
  and `/` redirects to `/web` instead of `/about`.
  Kept our version since glitch-soc's WebUI doesn't have what's
  needed yet and I think /about is still a much better landing
  page anyway.
- `app/models/form/admin_settings.rb`:
  Upstream added new settings, and glitch-soc had an extra setting.
  Not really a conflict.
  Added upstream's new settings.
- `app/serializers/initial_state_serializer.rb`:
  Upstream added a new `server` initial state object.
  Not really a conflict.
  Merged upstream's changes.
- `app/views/admin/settings/edit.html.haml`:
  Upstream added new settings.
  Not really a conflict.
  Merged upstream's changes.
- `app/workers/scheduler/feed_cleanup_scheduler.rb`:
  Upstream refactored that part and removed the file.
  Ported our relevant changes into `app/lib/vacuum/feeds_vacuum.rb`
- `config/settings.yml`:
  Upstream added new settings.
  Not a real conflict.
  Added upstream's new settings.
2022-10-02 18:46:22 +02: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) 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 Remove useless `respond_to` calls (#13208) 2020-03-06 01:29:38 +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