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-20 18:23:48 +02:00
2022-02-11 14:52:45 +01:00
2023-02-20 06:58:28 +01:00
2023-07-13 09:36:07 +02:00
2022-11-04 16:31:44 +01:00
2020-07-13 19:33:10 +02:00
2021-05-10 17:31:55 +02:00
2020-09-15 14:37:58 +02:00
2023-06-10 03:29:37 +02:00
2023-07-08 20:03:38 +02:00
2022-05-26 22:04:16 +02:00
2019-07-06 23:26:16 +02:00
2023-06-10 16:48:01 +02:00
2022-06-09 21:57:36 +02:00
2023-07-13 13:35:15 +02:00
2020-11-08 00:28:39 +01:00
2019-07-15 00:48:50 +02:00
2022-07-05 02:41:40 +02:00
2023-06-01 14:47:31 +02:00
2023-06-01 14:47:31 +02:00
2023-06-26 14:17:41 +02:00
2022-10-22 23:14:58 +02:00
2023-03-15 03:45:15 +01:00
2020-06-02 19:24:53 +02:00
2023-04-09 11:25:30 +02:00
2023-02-20 06:58:28 +01:00
2023-06-06 14:50:51 +02:00
2023-06-06 14:50:51 +02:00
2023-02-10 22:16:37 +01:00
2023-05-30 09:28:01 +02:00
2023-05-03 19:19:25 +02:00
2022-09-20 23:51:21 +02:00
2023-05-02 12:08:48 +02:00
2019-09-29 16:23:13 +02:00
2020-10-13 01:01:14 +02:00
2023-07-10 03:06:22 +02:00
2023-05-07 15:06:15 +02:00
2022-04-28 18:16:42 +02:00
2022-02-10 00:15:30 +01:00
2023-05-23 10:49:12 +02:00
2021-12-30 08:41:09 +01:00
2023-02-19 10:42:55 +01:00
2019-07-06 23:26:16 +02:00
2023-03-03 20:25:15 +01:00
2022-10-22 18:30:55 +02:00
2023-02-18 12:37:47 +01:00
2023-06-25 14:27:38 +02:00
2023-07-10 18:26:56 +02:00
2023-05-02 21:07:45 +02:00
2023-07-12 10:08:51 +02:00
2023-07-12 10:08:51 +02:00
2023-05-04 05:33:55 +02:00
2023-05-02 21:07:45 +02:00
2023-06-01 00:10:21 +02:00
2020-07-15 21:08:19 +02:00
2020-11-08 00:28:39 +01:00
2019-07-06 23:26:16 +02:00
2019-07-06 23:26:16 +02:00
2023-05-02 18:16:07 +02:00
2023-05-04 05:33:55 +02:00
2023-03-15 03:45:15 +01:00
2023-03-31 21:30:27 +02:00
2023-02-08 07:07:36 +01:00
2023-05-02 18:16:07 +02:00
2022-06-09 21:57:36 +02:00