mastodon/spec/helpers
Claire 993d0a9950 Merge commit '1e3b19230a48174acf524cf1a9f5a498e220ea7d' into glitch-soc/merge-upstream
Conflicts:
- `app/models/account.rb`:
  Upstream added new validations close to lines on which glitch-soc had
  modified validations to handle custom limits set through environment
  variables.
  Ported upstream changes.
- `config/initializers/content_security_policy.rb`:
  Upstream added `AZURE_ALIAS_HOST`. Glitch-soc's version of the file is
  completely different.
  Added `AZURE_ALIAS_HOST` to our version of the file.
2023-07-30 13:15:01 +02:00
..
admin
accounts_helper_spec.rb
application_helper_spec.rb Merge commit '82e477b184b5666fff7fb55933dce22ca2925db8' into glitch-soc/merge-upstream 2023-07-12 16:03:05 +02:00
flashes_helper_spec.rb
formatting_helper_spec.rb
home_helper_spec.rb
instance_helper_spec.rb
jsonld_helper_spec.rb
languages_helper_spec.rb
media_component_helper_spec.rb
react_component_helper_spec.rb
routing_helper_spec.rb
settings_helper_spec.rb
statuses_helper_spec.rb Cleanup unused portions of statuses/status partial (#26045) 2023-07-19 08:44:16 +02:00