Merge upstream changes (stable-4.3) - Githubissues

glitch-soc / mastodon

A glitchy but lovable microblogging server

https://glitch-soc.github.io/docs/

GNU Affero General Public License v3.0

708 stars 182 forks source link

Merge upstream changes (stable-4.3) #2865

Closed ClearlyClaire closed 1 month ago

ClearlyClaire commented 1 month ago

Conflicts

app/helpers/application_helper.rb: Upstream added a helper where glitch-soc had its own, not really a conflict. Added upstream's helper.

Ported changes

8ac00533ff1354a121b66c5148e9cce70e4e73e6
c828e7731c894b9ac265defe5e35a77cc32fbd4c
09cf617d7f8b633eb0f5ce84bf093e272943fede
931553844d851b7209039cd35629ae22818476cf
4a2d3929c5987fafde31d7ddd0a0d4842ae40eee
404f467fcf6db5c4510bc6dd788858f2440306ff
55b5364534a97c66b8612e6611ef0bba19b349d2
6d5aa58f88afbece2810c1321c3879d250ed11dc