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
..
2023-07-02 11:12:16 +02:00
2023-07-11 12:26:09 +02:00
2023-06-13 19:26:25 +02:00
2023-06-13 19:26:25 +02:00
2023-05-23 17:15:17 +02:00
2023-06-13 19:26:25 +02:00
2023-06-22 17:54:43 +02:00
2023-05-23 17:15:17 +02:00
2023-07-08 11:12:20 +02:00
2023-07-02 11:49:08 +02:00
2023-05-25 15:42:37 +02:00
2023-07-11 12:26:09 +02:00
2023-06-13 19:26:25 +02:00
2023-07-13 11:49:16 +02:00
2023-07-10 19:33:07 +02:00
2023-06-22 17:54:43 +02:00
2023-06-13 19:26:25 +02:00
2023-05-23 17:15:17 +02:00
2023-07-08 11:12:20 +02:00
2023-05-23 17:15:17 +02:00
2023-05-23 17:15:17 +02:00
2023-06-13 19:26:25 +02:00
2023-06-13 19:26:25 +02:00
2023-07-13 17:59:15 +02:00
2023-05-23 17:15:17 +02:00
2023-07-13 14:21:08 +02:00
2023-05-30 19:01:42 +02:00
2023-05-23 17:15:17 +02:00
2023-05-23 17:15:17 +02:00
2023-05-23 17:15:17 +02:00
2023-06-13 19:26:25 +02:00
2023-06-13 19:26:25 +02:00
2023-06-13 19:26:25 +02:00
2023-07-08 20:01:08 +02:00
2023-07-12 15:00:10 +02:00
2023-05-25 15:42:37 +02:00
2023-06-22 17:54:43 +02:00
2023-05-23 17:15:17 +02:00
2023-07-08 11:12:20 +02:00
2023-06-13 19:26:25 +02:00
2023-07-10 18:26:56 +02:00
2023-05-23 17:15:17 +02:00
2023-07-13 15:53:03 +02:00
2023-05-23 17:15:17 +02:00
2023-07-20 14:46:02 +02:00
2023-05-23 17:15:17 +02:00