tootlab-mastodon

mirror of https://github.com/glitch-soc/mastodon.git synced 2025-01-14 03:32:56 -05:00

History

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

aliases

Fix IDN domains not being rendered correctly in a few left-over places (#17848 )

2022-03-22 10:07:11 +01:00

applications

Fix haml-lint Rubocop Lint/UnusedBlockArguments cop (#26039 )

2023-07-20 17:03:39 +02:00

deletes

Fix style for hashes (#20518 )

2022-11-17 11:05:39 +01:00

exports

Change user backups to use expiring URLs for download when possible (#24136 )