mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-26 01:54:03 -05: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 | ||
| apps | ||
| emails | ||
| statuses | ||
| timelines | ||
| accounts_show_spec.rb | ||
| apps_spec.rb | ||
| bookmarks_spec.rb | ||
| domain_blocks_spec.rb | ||
| featured_tags_spec.rb | ||
| follow_requests_spec.rb | ||
| lists_spec.rb | ||
| mutes_spec.rb | ||
| polls_spec.rb | ||
| suggestions_spec.rb | ||
| tags_spec.rb | ||