mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2025-01-15 09:06:43 +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. |
||
|---|---|---|
| .. | ||
| accounts | ||
| admin | ||
| announcements | ||
| featured_tags | ||
| instances | ||
| lists | ||
| polls | ||
| push | ||
| statuses | ||
| timelines | ||
| trends | ||
| accounts_controller_spec.rb | ||
| announcements_controller_spec.rb | ||
| blocks_controller_spec.rb | ||
| conversations_controller_spec.rb | ||
| custom_emojis_controller_spec.rb | ||
| directories_controller_spec.rb | ||
| endorsements_controller_spec.rb | ||
| favourites_controller_spec.rb | ||
| filters_controller_spec.rb | ||
| followed_tags_controller_spec.rb | ||
| instances_controller_spec.rb | ||
| markers_controller_spec.rb | ||
| media_controller_spec.rb | ||
| notifications_controller_spec.rb | ||
| preferences_controller_spec.rb | ||
| reports_controller_spec.rb | ||
| scheduled_statuses_controller_spec.rb | ||
| statuses_controller_spec.rb | ||
| streaming_controller_spec.rb | ||