app/javascript/styles/mastodon/components.scss:
Conflict caused by glitch-soc changing the path to images, and upstream removing styling using such an image.
Removed the styling as upstream did.
app/models/account.rb:
Conflict due to upstream changing lines adjacent to a change made in glitch-soc to have configurable limits.
Ported upstream's changes.
yarn.lock:
Dependencies adjacent to glitch-soc-only dependencies updated.
Updated them as well.
Ported changes
fb6d7ed4752ec94ce414de6e78cdaf3f7515f9e9
346cdb998c8b8519292a0a1633a28a3938665f44
029c99bd7b5bca19b11d63a09c3e71b86306dad4
d11231a420cf80c3f924233d398002639cac0f8b
11a63b2db6146a5bc4d85b5c1b56ccd932a212ea
393f0a0159f8c12316e903979f6a506e44ea2b50 (although this is not actually in use yet)
Additional changes
8a222b39513c2e0d1c2149aa66556bee9875b1b2 (fix assets build failure caused by search path inconsistency in CSS files)
Conflicts
app/javascript/styles/mastodon/components.scss: Conflict caused by glitch-soc changing the path to images, and upstream removing styling using such an image. Removed the styling as upstream did.app/models/account.rb: Conflict due to upstream changing lines adjacent to a change made in glitch-soc to have configurable limits. Ported upstream's changes.yarn.lock: Dependencies adjacent to glitch-soc-only dependencies updated. Updated them as well.Ported changes
Additional changes