mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-09-29 05:18:48 +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. |
||
---|---|---|
.. | ||
environments | ||
imagemagick | ||
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 |