me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
glitchier-soc/app/controllers/api/v2
History
Claire fe5f6bc7ed Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `.github/workflows/build-image.yml`:
  Fix erroneous deletion in a previous merge.
- `Gemfile`:
  Conflict caused by glitch-soc-only hCaptcha dependency
- `app/controllers/auth/sessions_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
- `app/controllers/filters_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
- `app/serializers/rest/status_serializer.rb`:
  Minor conflict due to glitch-soc having an extra `local_only` property
2022-06-28 11:11:18 +02:00
..
admin Fix /api/v1/admin/accounts (#17887) 2022-03-28 23:57:38 +02:00
filters_controller.rb Revamp post filtering system (#18058) 2022-06-28 09:42:13 +02:00
media_controller.rb Change local media attachments to perform heavy processing asynchronously (#13210) 2020-03-08 23:56:18 +01:00
search_controller.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-04-08 23:00:03 +02:00
suggestions_controller.rb Add cold-start follow recommendations (#15945) 2021-04-12 12:37:14 +02:00