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-06-22 14:55:22 +02:00
2023-06-14 15:21:36 +02:00
2023-06-18 13:41:33 +02:00
2023-06-10 18:38:22 +02:00
2023-06-14 16:44:37 +02:00
2023-05-19 17:13:29 +02:00
2023-05-04 05:49:53 +02:00
2023-05-04 05:49:53 +02:00
2023-06-06 13:58:33 +02:00
2023-05-04 05:49:53 +02:00
2023-06-06 13:58:33 +02:00
2023-04-26 21:29:36 +02:00
2023-07-12 09:49:33 +02:00
2023-05-04 05:49:53 +02:00
2023-07-20 18:23:48 +02:00
2023-06-14 16:44:37 +02:00
2023-02-20 13:24:14 +09:00
2023-03-04 16:43:47 +01:00
2023-05-04 05:49:53 +02:00
2023-05-04 05:49:53 +02:00
2023-05-04 05:49:53 +02:00
2023-03-04 17:16:45 +01:00
2023-05-04 05:49:53 +02:00
2023-06-06 13:58:33 +02:00
2023-05-04 05:49:53 +02:00
2023-05-04 05:49:53 +02:00
2023-05-04 05:49:53 +02:00
2023-03-04 17:16:45 +01:00
2023-06-14 16:44:37 +02:00
2023-05-04 05:49:53 +02:00
2023-05-04 05:49:53 +02:00
2023-05-04 05:49:53 +02:00
2023-05-04 05:49:53 +02:00
2023-03-04 17:16:45 +01:00
2023-06-06 13:58:33 +02:00
2023-06-06 15:51:42 +02:00
2023-05-04 05:49:53 +02:00
2023-06-06 13:58:33 +02:00
2023-03-04 16:43:47 +01:00
2023-06-06 13:58:33 +02:00
2023-05-04 05:49:53 +02:00
2023-05-04 05:49:53 +02:00
2023-05-08 19:28:21 +02:00
2023-06-06 13:58:33 +02:00
2023-05-04 05:49:53 +02:00
2023-06-06 13:58:33 +02:00
2023-06-06 13:58:33 +02:00
2023-05-04 05:49:53 +02:00
2023-03-04 17:16:45 +01:00
2023-05-04 05:49:53 +02:00
2023-05-04 05:49:53 +02:00
2023-05-04 05:49:53 +02:00
2023-03-04 17:16:45 +01:00
2023-07-06 15:05:05 +02:00
2023-05-04 05:49:53 +02:00
2023-05-04 05:49:53 +02:00
2023-06-10 18:38:22 +02:00
2023-03-04 17:00:00 +01:00
2023-03-04 17:16:45 +01:00
2023-05-04 05:49:53 +02:00
2023-03-04 16:43:47 +01:00
2023-05-04 05:49:53 +02:00
2023-05-04 05:49:53 +02:00
2023-03-04 16:43:47 +01:00
2023-05-08 19:28:21 +02:00
2023-07-12 09:49:33 +02:00
2023-05-04 05:49:53 +02:00
2023-05-04 05:49:08 +02:00
2023-06-06 13:58:33 +02:00
2023-05-22 13:15:21 +02:00
2023-03-04 17:16:45 +01:00
2023-05-04 05:49:53 +02:00
2023-06-22 14:55:22 +02:00
2023-06-22 14:55:22 +02:00
2023-06-06 13:58:33 +02:00
2023-03-04 17:16:45 +01:00
2023-06-06 13:58:33 +02:00
2023-06-18 13:41:33 +02:00
2023-05-04 05:49:53 +02:00
2023-05-04 05:49:53 +02:00
2023-05-04 05:49:53 +02:00
2023-06-18 13:59:47 +02:00
2023-05-04 05:49:53 +02:00
2023-02-20 06:58:28 +01:00
2023-05-04 05:49:53 +02:00
2023-05-04 05:49:53 +02:00
2023-07-12 09:49:33 +02:00
2023-06-19 14:06:06 +01:00
2023-06-06 15:51:42 +02:00
2023-05-04 05:49:53 +02:00
2023-05-04 05:49:53 +02:00