5 Commits (e271d018b70a7cefc731c9ba8d322f15c8ba80e1)

Author	SHA1	Message	Date
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
Claire	ec91ea4457	Fix missing validation on `default_privacy` setting (#25513)	2023-06-20 18:32:14 +02:00
Claire	dd07393e75	Fix user settings not getting validated (#25508)	2023-06-19 14:06:06 +01:00
Claire	3dcba94e68	Migrate glitch-soc's exclusive user settings	2023-03-31 22:50:57 +02:00
Eugen Rochko	a9b5598c97	Change user settings to be stored in a more optimal way (#23630) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2023-03-30 14:44:00 +02:00