Merge upstream changes up to 1fc165de02d79294c8a218f5fa82bcd477484ca1 - Githubissues

glitch-soc / mastodon

A glitchy but lovable microblogging server

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

GNU Affero General Public License v3.0

707 stars 182 forks source link

Merge upstream changes up to 1fc165de02d79294c8a218f5fa82bcd477484ca1 #2887

Closed ClearlyClaire closed 1 month ago

ClearlyClaire commented 1 month ago

Conflicts

.env.production.sample: Upstream added a block of three environment variables, while glitch-soc has a different version of the file overall. Added upstream's changes.
app/helpers/application_helper.rb: Upstream added a helper, while glitch-soc had extra helpers. Added upstream's helper.

Ported changes

51345e5133a7f7b84044b9aeebdf99fd769ddf40
5e4cc1a39c86d75995dc0a86a021085adc3a8c63
5afdb81b366ed423588e0a29c146539978180de0
7a7a7cc448514609a268a2c6bceca414783579ee
25f8003d75515fb1c195c6f4ca2ea92a0d58163e
6c87c76e1825a377ebb87fdfcf7f5c438c1be589
8b5650962557726c8b1dfca6ccc4b41d96a693b6
0f37b7d6acd2a7666ce56354d9196da2ec02da81
1fc165de02d79294c8a218f5fa82bcd477484ca1
bc2e642272eec058f153b59b155712e61bc2af7d