mirror/blueb-Chuckya-fe-standalone
1
0
Fork 0
mirror of https://iceshrimp.dev/blueb/Chuckya-fe-standalone.git synced 2026-01-12 14:03:16 -08:00
Code Issues Projects Releases Packages Wiki Activity
blueb-Chuckya-fe-standalone/app/controllers/api
History
Claire 0ad919b192 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.js`:
  glitch-soc change because of having changed the default number of
  available poll options.
  Applied upstream's changes while keeping glitch-soc's default number of
  poll options.
- `public/oops.png`:
  We had a minor graphics change, probably not worth diverging from upstream.
  Took upstream version.
2022-11-06 09:50:41 +01:00
..
v1 Merge branch 'main' into glitch-soc/merge-upstream 2022-11-06 09:50:41 +01:00
v2 Merge branch 'main' into glitch-soc/merge-upstream 2022-11-06 09:50:41 +01:00
web Refactor formatter (#17828) 2022-03-26 02:53:34 +01:00
base_controller.rb Change AUTHORIZED_FETCH to not block unauthenticated REST API access (#19803) 2022-11-05 22:56:03 +01:00
oembed_controller.rb Fix OEmbed leaking information about existence of non-public statuses (#12930) 2020-01-24 00:20:51 +01:00