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
..
environments
initializers
locales	Add finer permission requirements for managing webhooks (#25463)	2023-06-22 14:52:25 +02:00
locales-glitch
routes	Merge commit '55e7c08a83547424024bac311d5459cb82cf6dae' into glitch-soc/merge-upstream	2023-06-25 14:27:38 +02:00
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