djsundog/tootlab-mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2024-11-25 09:34:16 -05:00
Code Issues Packages Projects Releases Wiki Activity
f8d867bac4
tootlab-mastodon/app/controllers/api/v1/accounts
History
Claire f8d867bac4 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/services/remove_status_service.rb`:
  Conflict caused by us having a distinc Direct timeline.
  Ported upstream changes.
- `app/javascript/mastodon/features/compose/components/compose_form.js`:
  Conflict between glitch-soc's variable character limit and upstream
  refactoring that part of the code.
  Ported upstream changes.
2020-12-05 17:33:37 +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 Fix incorrect conditions for suspended accounts in Get API for account featured tags (#15270) 2020-12-04 04:22:35 +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 Change REST API to return empty data for suspended accounts (#14765) 2020-09-11 15:16:29 +02:00
lists_controller.rb Change REST API to return empty data for suspended accounts (#14765) 2020-09-11 15:16:29 +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 Change REST API to return empty data for suspended accounts (#14765) 2020-09-11 15:16:29 +02:00