mirrors/nyastodon
1
0
Fork 0
mirror of https://git.bsd.gay/fef/nyastodon.git synced 2024-12-28 22:53:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
nyastodon/app/controllers/api/v1/accounts
History
Claire 9b861d56a9 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `.env.production.sample`:
  Copied upstream changes.
- `app/controllers/settings/identity_proofs_controller.rb`:
  Minor conflict due to glitch-soc's extra “enable_keybase” setting.
  Upstream removed keybase support altogether, so did the same.
- `app/controllers/well_known/keybase_proof_config_controller.rb`:
  Minor conflict due to glitch-soc's extra “enable_keybase” setting.
  Upstream removed keybase support altogether, so did the same.
- `lib/mastodon/statuses_cli.rb`:
  Minor conflict due to an optimization that wasn't shared between
  the two versions. Copied upstream's version.
2021-11-26 22:53:55 +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
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 REST API to return empty data for suspended accounts (#14765) 2020-09-11 15:16:29 +02:00
following_accounts_controller.rb Change REST API to return empty data for suspended accounts (#14765) 2020-09-11 15:16:29 +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 Add GET /api/v1/accounts/lookup REST API (#15740) 2021-02-16 15:28:32 +01: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 Further improve the media attached status query for accounts (#16106) 2021-04-26 18:57:46 +02:00