mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-22 21:26:52 +00:00
993d0a9950
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. |
||
---|---|---|
.. | ||
admin | ||
accounts_helper_spec.rb | ||
application_helper_spec.rb | ||
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 |