mirrors/nyastodon
1
0
Fork 0
mirror of https://git.bsd.gay/fef/nyastodon.git synced 2024-12-28 01:53:41 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
nyastodon/app/controllers/api
History
Claire 7452a95998 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `.github/dependabot.yml`:
  Upstream made changes while we have dropped this file.
  Keep the file deleted.
- `.prettierignore`:
  Upstream made changes at the end of the file, where we
  had our extra lines.
  Just moved our extra lines back at the end.
- `app/serializers/initial_state_serializer.rb`:
  Upstream code style changes.
  Applied them.
- `app/services/backup_service.rb`:
  Upstream code style changes.
  Applied them.
2023-02-19 10:42:55 +01:00
..
v1 Merge branch 'main' into glitch-soc/merge-upstream 2023-02-19 10:42:55 +01:00
v2 Merge branch 'main' into glitch-soc/merge-upstream 2023-02-19 10:42:55 +01:00
web Refactor formatter (#17828) 2022-03-26 02:53:34 +01:00
base_controller.rb Change CSP directives on API to be tight and concise (#20960) 2022-12-15 16:40:32 +01:00
oembed_controller.rb Fix OEmbed leaking information about existence of non-public statuses (#12930) 2020-01-24 00:20:51 +01:00