Merge upstream changes up to e2844173499254bd5f460ca2c205d16de228db62

[polyamAdmin]

Merge upstream up to d49343ed11b3c08c4e81ecd70e17e01bd30154a6

Some changes were already included and ported in #505

Conflicts:

• app/lib/themes.rb Conflict due to glitch-soc's theming system. Discarded change.
• app/views/layouts/application.html.haml Loading of stylesheets is handled differently due to glitch-soc's theming system. Discarded change.
• app/views/layouts/embedded.html.haml Same as above.
• app/views/layouts/error.html.haml Same as above.
• config/settings.yml Glitch-soc and polyam-glitch use skin instead of theme Changed "default" to "system".

Ported changes:

• 02ea16150647ac3baf0bb8a89203ccc7200b4a2f

Additional changes:

• 5231943716fdaf228ca97c69ef1e4b97bd97b0bd

---

Merge upstream up to e2844173499254bd5f460ca2c205d16de228db62

Conflicts:

• yarn.lock Version bump close to a polyam/glitch dependency. Applied bump.
• app/helpers/application_helper.rb Upstream added to a function with different structure for polyam-glitch. Added changes.
• app/lib/themes.rb Change textually close to polyam-glitch change. Applied change.
• app/views/user_mailer/welcome.html.haml Upstream made changes where modifications were made to remove apps from welcome e-mail. Applied change and removed apps again.
• spec/requests/api/v2/instance_spec.rb Upstream made changed textually close to polyam-glitch changes. Applied changes.

Skipped changes:

• f2fd1da23fa6bc1847bf7d96a76826f36b29ae8c (Already fixed)

Ported changes:

• 27d014a7fa4a92117e133adfd1c3e4e1c34ddc9c
• 9fbe8d3a0cf33e1ec7f631b7651e9fb2bca8440e
• b9982ce578c24fa2dcdbe4fb79610345257681df
• c913e2f3e50eb4f0f7c1459717ede3070b3e6846
• d08896476100e440d340f19540ae964887bc0a57
• 961bb84e4c87555bbce930a87291938a988a483a
• 4f068d4fcc4d134fcbd56faa8f39c608dd343417
• 67442f90393c644064bf34d531bdebe15f88d729
• 69e5771881037e52380712dfc029c101f76efe74
• 430da0316062d3fabfb74dec68bb6de9d42ee750
• 90eb4a5d01f1f1e8a76e7dc814eae992a9c1ee16
• fa9574086d1b2cc16a733cd60677054c67eed48d
• 07635228e2b2182888850cecddd4b09756d9edbc
• e47a3d00fe21fa51ee1aeffbfb5e152f1f715fef
• b4d991adaa82e05a2dd95ae5c08bb374391ef568
• 0b9d4103cb5502faee4cc61717aa5454f63bc8f5
• 5d67247061770bb4228c479dd03845735b849e3a
• e2844173499254bd5f460ca2c205d16de228db62

[polyamAdmin]

I actually didn't expect the test suite to pass. Anyway, I kinda ran out of patience, so I plan to merge this should upstream not deal with this soon. Unfortunately, this can cause conflicting implementations and therefor issues down the line.

[polyamAdmin]

I'm extremely confused about those TS errors, since it's the same code as upstream.

facepalm I used ts instead of tsx...

[polyamAdmin]

Really should've chosen an earlier cut-off point for the second batch... D:

[polyamAdmin]

hmh Currently the stylesheets for light and dark theme are added twice. Not sure why.

theme_style_tags returns the correct value and I don't find any indication that anything is loaded twice and yet...

Ah, it is an upstream issue which got fixed in a later commit.

[polyamAdmin]

There is some activity upstream again. I think the thing I thought that would happen happens where I merge this and upstream immediately works on it. I really hope not all 200 commits will be merged upstream... Also I already put a considerable amount of work and time into this, so I'll merge this either way. One issue is the next commit causes issues for the glitch flavour and I'm not sure how to deal with those yet. Maybe just port those to make the glitch flavour still function like usual? Anyway