izaliamae/glitch-soc
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
glitch-soc/app/controllers/api
History
Claire b135b6ba8f Merge commit '8ebc94dd22a18c28c4c9763b909e92e6ba64e242' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/admin/custom_emojis/new.html.haml`:
  Conflict caused by glitch-soc having a different file size limit constant
  name.
  Updated like upstream did while keeping glitch-soc's constant name.
2023-12-19 21:24:01 +01:00
..
v1 Merge commit '8ebc94dd22a18c28c4c9763b909e92e6ba64e242' into glitch-soc/merge-upstream 2023-12-19 21:24:01 +01:00
v2 Merge commit '973597c6f1e25b16c592e5573304319aeaa375e1' into glitch-soc/merge-upstream 2023-12-19 20:51:37 +01:00
web Improve spec coverage for api/web/push_subscriptions controller (#27858) 2023-11-15 13:14:51 +00:00
base_controller.rb Specs for minimal CSP policy in Api:: controllers (#27845) 2023-11-14 14:34:30 +00:00
oembed_controller.rb Fix OEmbed leaking information about existence of non-public statuses (#12930) 2020-01-24 00:20:51 +01:00