mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-11-23 23:58:06 +01:00
178e151019
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. |
||
|---|---|---|
| .. | ||
| _mixins.scss | ||
| about.scss | ||
| accessibility.scss | ||
| accounts.scss | ||
| admin.scss | ||
| basics.scss | ||
| boost.scss | ||
| branding.scss | ||
| components.scss | ||
| containers.scss | ||
| dashboard.scss | ||
| emoji_picker.scss | ||
| forms.scss | ||
| lists.scss | ||
| modal.scss | ||
| polls.scss | ||
| reset.scss | ||
| rich_text.scss | ||
| rtl.scss | ||
| statuses.scss | ||
| tables.scss | ||
| variables.scss | ||
| widgets.scss | ||