Fediversity/Fediversity
7
1
Fork 3
Code Issues 22 Pull requests 1 Actions Projects 1 Activity

hans/matrix #46

Merged
fricklerhandwerk merged 49 commits from hans/matrix into main 2024-12-02 15:40:46 +01:00
Conversation 3 Commits 49 Files changed 30 +1892 -26
hans commented 2024-12-02 10:03:53 +01:00
Contributor
Copy link

All the documentation about setting up a Matrix server for now, cleaned up by @Niols, ready to merge.

All the documentation about setting up a Matrix server for now, cleaned up by @Niols, ready to merge.
hans added 49 commits 2024-12-02 10:03:55 +01:00
Extra bit of Draupnir documentation.
All checks were successful
/ check-pre-commit (pull_request) Successful in 21s
Details
/ check-website (pull_request) Successful in 26s
Details
8e8dfa2ec6
Niols approved these changes 2024-12-02 12:48:15 +01:00
Niols left a comment
Owner
Copy link

LGTM. I have only skimmed through it and I definitely need to read all this, but for now I think it is very fine to add to main.

LGTM. I have only skimmed through it and I definitely need to read all this, but for now I think it is very fine to add to `main`.
fricklerhandwerk merged commit f2da1e8ed1 into main 2024-12-02 15:40:46 +01:00
fricklerhandwerk deleted branch hans/matrix 2024-12-02 15:40:47 +01:00
fricklerhandwerk commented 2024-12-02 15:43:47 +01:00
Owner
Copy link

Hah, (unsurprisingly) rebasing rewrites the commit history such that all the nice signatures are lost. Forgejo seems to be fundamentally incompatible with linear history. Time to switch to Gerrit then?

Hah, (unsurprisingly) rebasing rewrites the commit history such that all the nice signatures are lost. Forgejo seems to be fundamentally incompatible with linear history. Time to switch to Gerrit then?
Niols commented 2024-12-02 16:10:25 +01:00
Owner
Copy link

GitHub doesn't do any better in that regard, except it signs with its own key and calls that verified :p I don't think there is a good way to do things, no matter what the software is; the only two solutions that I see that do not involve merging by hand are to not modify those commits, which means either allowing only fast-forward, or creating merge commits.

GitHub doesn't do any better in that regard, except it signs with its own key and calls that verified :p I don't think there is a good way to do things, no matter what the software is; the only two solutions that I see that do not involve merging by hand are to not modify those commits, which means either allowing only fast-forward, or creating merge commits.
fricklerhandwerk commented 2024-12-03 13:44:22 +01:00
Owner
Copy link

I'll leave FF and squash for now then.

I'll leave FF and squash for now then.
Sign in to join this conversation.
Reviewers
No reviewers
Niols
Labels
Clear labels   
blocked

   
project-management

Project management related tasks

  
question
No labels
blocked
project-management
question
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
3 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: Fediversity/Fediversity#46
No description provided.
Delete branch "hans/matrix"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?