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-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-06-23 16:34:27 +02:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-06-02 15:00:27 +02:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-06-02 15:00:27 +02:00
2023-06-05 09:52:36 +02:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-06-10 15:32:29 +02:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00