mirrors/nyastodon
1
0
Fork 0
mirror of https://git.bsd.gay/fef/nyastodon.git synced 2024-12-28 05:23:41 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
nyastodon/app/controllers/api
History
Claire 85558a5e18 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Minor upstream change, our README is completely different.
  Kept ours.
- `lib/tasks/assets.rake`:
  glitch-soc has extra code to deal with its theming system,
  upstream changed a line that exists in glitch-soc.
  Applied upstream changes.
2023-02-09 12:46:12 +01:00
..
v1 Merge branch 'main' into glitch-soc/merge-upstream 2023-02-09 12:46:12 +01:00
v2 Merge branch 'main' into glitch-soc/merge-upstream 2022-11-14 08:35: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