izaliamae/glitch-soc
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
glitch-soc/spec/requests/api
History
Claire 993d0a9950 Merge commit '1e3b19230a48174acf524cf1a9f5a498e220ea7d' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/account.rb`:
  Upstream added new validations close to lines on which glitch-soc had
  modified validations to handle custom limits set through environment
  variables.
  Ported upstream changes.
- `config/initializers/content_security_policy.rb`:
  Upstream added `AZURE_ALIAS_HOST`. Glitch-soc's version of the file is
  completely different.
  Added `AZURE_ALIAS_HOST` to our version of the file.
2023-07-30 13:15:01 +02:00
..
v1 Merge commit '1e3b19230a48174acf524cf1a9f5a498e220ea7d' into glitch-soc/merge-upstream 2023-07-30 13:15:01 +02:00
v2 Fix processing of media files with unusual names (#25788) 2023-07-07 13:35:22 +02:00
web Fix embed dropdown menu item for unauthenticated users (#25964) 2023-07-13 15:53:03 +02:00