You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
nyastodon/app/controllers/api
Claire 9a3d91f629 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/models/concerns/domain_materializable.rb`:
  Fixed a code style issue upstream in a PR that got merged in glitch-soc
  earlier.
  Changed the code to match upstream's.
1 year ago
..
v1 Merge branch 'main' into glitch-soc/merge-upstream 1 year ago
v2 Merge branch 'main' into glitch-soc/merge-upstream 2 years ago
web
base_controller.rb Add 'private' to Cache-Control, match Rails expectations (#20608) 2 years ago
oembed_controller.rb