Notes on this week merge with gitea.
- User settings were merged and the forgefriends backport is not longer needed, it was reverted. The samantic is slightly different and the forgefriends code was adapted.
- Conflicts had to be resolved as a result of three refactors impacting the forgefriends code (1, 2, 3)