mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-21 12:47:58 +00: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. |
||
|---|---|---|
| .. | ||
| environments | ||
| initializers | ||
| locales | ||
| locales-glitch | ||
| routes | ||
| webpack | ||
| application.rb | ||
| boot.rb | ||
| brakeman.ignore | ||
| database.yml | ||
| deploy.rb | ||
| environment.rb | ||
| formatjs-formatter.js | ||
| i18n-tasks.yml | ||
| navigation.rb | ||
| pghero.yml | ||
| puma.rb | ||
| roles.yml | ||
| routes.rb | ||
| secrets.yml | ||
| settings.yml | ||
| sidekiq.yml | ||
| storage.yml | ||
| webpacker.yml | ||