Claire
178e151019
Merge commit '55e7c08a83547424024bac311d5459cb82cf6dae' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/user_settings.rb`:
Upstream added a constraint on a setting textually close
to glitch-soc-only settings.
Applied upstream's change.
- `lib/sanitize_ext/sanitize_config.rb`:
Upstream added support for the `translate` attribute on a few elements,
where glitch-soc had a different set of allowed elements and attributes.
Extended glitch-soc's allowed attributes with `translate` as upstream did.
- `spec/validators/status_length_validator_spec.rb`:
Upstream refactored to use RSpec's `instance_double` instead of `double`,
but glitch-soc had changes to tests due to configurable max toot chars.
Applied upstream's changes while keeping tests against configurable max
toot chars.
2023-06-25 14:27:38 +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-06-22 14:55:22 +02:00
2023-05-04 05:49:53 +02:00
2023-06-06 15:51:42 +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-06-10 18:27:35 +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-06-06 13:58: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-06-06 15:51:42 +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