tootlab-mastodon

mirror of https://github.com/glitch-soc/mastodon.git synced 2025-02-08 16:02:14 -05:00

History

Claire c04f2d0cf7 Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `app/views/admin/settings/appearance/show.html.haml`:
  Upstream enforced an uniform code style around lambdas, and glitch-soc
  had a different lambda due to its theming system.
  Applied the same code style changes.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream enforced an uniform code style around lambdas, and glitch-soc
  removed some code just after the lambda.
  Applied the same code style changes.

2023-07-17 19:02:23 +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 lambda cop (#25946 )

2023-07-17 15:07:29 +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 )