Claire
75580360cd
Merge commit '272592d16d40e804ec325ef3b5e6de9bbad5f2dd' into glitch-soc/merge-upstream
...
Conflicts:
- `.rubocop_todo.yml`:
Upstream fixed a bunch lint issues, and changed the `Max` parameter of the
`Metrics/AbcSize` cop.
Glitch-soc has different code and slightly higher `AbcSize` complexity,
modified the `.rubocop_todo.yml` file accordingly.
- `app/policies/status_policy.rb`:
Upstream changed `account.suspended?` to `account.unavailable?` to prepare
for delete flags. Glitch-soc has additional local-only conditions.
Ported upstream's refactor while keeping glitch-soc's additional condition.
- `app/serializers/initial_state_serializer.rb`:
Upstream refactored a bunch of stuff while glitch-soc has more settings.
Refactored as upstream did while keeping glitch-soc's settings.
2023-12-20 22:05:31 +01:00
..
2023-02-20 06:58:28 +01:00
2023-05-23 10:49:12 +02:00
2023-11-30 13:30:35 +00:00
2023-12-20 22:05:31 +01:00
2023-10-17 21:42:49 +02:00
2023-12-18 19:10:43 +01:00
2023-08-14 18:52:45 +02:00
2023-02-20 06:58:28 +01:00
2023-10-24 10:06:10 +00:00
2023-06-20 18:32:26 +02:00
2020-09-15 14:37:58 +02:00
2023-02-20 06:58:28 +01:00
2023-04-17 14:16:36 +02:00
2023-10-24 10:06:10 +00:00
2023-02-20 06:58:28 +01:00
2023-02-20 06:58:28 +01:00
2023-02-20 06:58:28 +01:00
2023-03-31 15:07:22 +02:00
2023-05-23 10:49:12 +02:00
2021-04-24 17:01:43 +02:00
2023-02-20 06:58:28 +01:00
2020-03-12 17:57:59 +01:00
2023-10-24 10:06:10 +00:00
2023-12-20 22:05:31 +01:00
2022-11-14 08:06:06 +01:00
2020-01-23 22:00:13 +01:00
2023-05-02 18:23:35 +02:00
2023-07-13 09:36:07 +02:00
2023-04-30 14:06:53 +02:00
2023-09-22 16:01:59 +02:00
2023-03-27 17:07:37 +02:00
2023-05-02 18:23:35 +02:00
2023-02-20 06:58:28 +01:00
2023-05-02 12:08:48 +02:00
2023-06-01 14:47:31 +02:00
2023-02-20 06:58:28 +01:00
2022-09-27 03:08:19 +02:00
2023-02-20 06:58:28 +01:00
2023-02-20 06:58:28 +01:00
2019-09-09 22:44:17 +02:00
2022-11-14 08:06:06 +01:00
2023-09-26 13:13:27 +02:00
2023-02-20 06:58:28 +01:00
2023-02-20 06:58:28 +01:00
2023-03-31 15:07:22 +02:00
2023-02-20 06:58:28 +01:00
2023-04-09 11:25:30 +02:00
2023-06-06 14:50:51 +02:00
2023-07-12 10:03:06 +02:00
2023-07-12 10:03:06 +02:00
2023-02-20 06:58:28 +01:00
2022-09-20 23:51:21 +02:00
2022-10-13 14:42:37 +02:00
2023-02-20 06:58:28 +01:00
2023-10-24 10:06:10 +00:00
2023-11-07 13:01:09 +00:00
2023-05-23 10:49:12 +02:00
2023-03-04 16:38:28 +01:00
2023-08-18 18:20:55 +02:00
2023-05-02 14:40:36 +02:00
2023-02-20 06:58:28 +01:00
2022-04-19 15:06:38 +02:00
2023-05-23 15:00:36 +02:00
2023-05-02 12:08:48 +02:00
2022-11-14 08:06:06 +01:00
2023-07-27 16:11:17 +02:00
2022-11-14 08:06:06 +01:00
2023-02-20 06:58:28 +01:00
2023-02-20 06:58:28 +01:00
2023-05-03 19:19:25 +02:00
2021-01-07 09:40:55 +01:00
2023-08-04 09:00:31 +02:00
2023-02-20 06:58:28 +01:00
2019-09-06 13:55:51 +02:00
2023-12-20 20:10:45 +01:00
2023-02-20 06:58:28 +01:00
2020-06-02 19:24:53 +02:00
2023-02-20 06:58:28 +01:00
2023-07-13 09:36:07 +02:00
2023-02-20 06:58:28 +01:00
2023-02-27 09:31:15 +01:00
2023-09-15 19:52:28 +02:00
2023-09-25 19:21:07 +02:00
2022-10-08 16:45:40 +02:00
2023-11-13 09:58:28 +00:00
2023-11-13 09:58:28 +00:00
2022-10-08 08:34:00 +02:00
2023-08-24 21:50:14 +02:00
2023-10-06 12:58:16 +02:00
2023-10-24 10:06:10 +00:00
2023-02-19 07:09:40 +09:00
2023-09-28 16:52:23 +02:00
2023-02-20 06:58:28 +01:00
2023-11-29 10:39:59 +00:00
2022-11-14 06:28:19 +01:00
2019-01-06 16:38:40 +01:00
2023-05-02 18:23:35 +02:00
2023-02-20 06:58:28 +01:00
2023-09-25 19:21:07 +02:00
2023-09-01 17:47:07 +02:00
2023-12-19 20:51:37 +01:00
2023-02-20 06:58:28 +01:00
2023-09-15 19:52:28 +02:00
2022-10-14 01:44:23 +02:00
2023-12-20 22:05:31 +01:00
2023-02-18 04:30:23 +01:00
2022-11-10 09:36:47 +01:00
2022-07-17 13:49:29 +02:00
2023-11-14 15:33:59 +00:00
2019-05-09 22:03:02 +02:00
2023-06-01 00:10:21 +02:00
2023-07-12 15:38:35 +02:00
2023-02-20 06:58:28 +01:00
2019-04-09 23:06:30 +09:00
2023-02-20 06:58:28 +01:00
2023-11-29 10:00:52 +00:00
2023-09-02 15:02:29 +02:00
2023-12-20 22:05:31 +01:00
2023-02-20 06:58:28 +01:00
2023-11-13 22:47:44 +00:00