Deuxfleurs/nixcfg
17
6
Fork 2
Code Issues 9 Pull requests 2 Projects Releases Wiki Activity

Upgrade cryptpad from 2024.3.0 to 2024.3.1 #27

Open
KokaKiwi wants to merge 2 commits from KokaKiwi/nixcfg:update-cryptpad-2024.3.1 into main
pull from: KokaKiwi/nixcfg:update-cryptpad-2024.3.1
merge into: Deuxfleurs:main
Conversation 0 Commits 2 Files changed 8 +106 -6231
KokaKiwi commented 2024-05-23 20:24:05 +00:00
Owner
Copy link
  • Also migrate from niv to npins for pinned sources

Changelog: https://github.com/cryptpad/cryptpad/blob/2024.3.1/CHANGELOG.md

- Also migrate from `niv` to [npins](https://github.com/andir/npins) for pinned sources Changelog: https://github.com/cryptpad/cryptpad/blob/2024.3.1/CHANGELOG.md
KokaKiwi added 2 commits 2024-05-23 20:24:06 +00:00
maximilien approved these changes 2024-05-24 06:07:09 +00:00
This pull request can be merged automatically.
This branch is out-of-date with the base branch
You are not authorized to merge this pull request.
View command line instructions.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u update-cryptpad-2024.3.1:KokaKiwi-update-cryptpad-2024.3.1
git checkout KokaKiwi-update-cryptpad-2024.3.1

Merge

Merge the changes and update on Forgejo.
git checkout main
git merge --no-ff KokaKiwi-update-cryptpad-2024.3.1
git checkout main
git merge --ff-only KokaKiwi-update-cryptpad-2024.3.1
git checkout KokaKiwi-update-cryptpad-2024.3.1
git rebase main
git checkout main
git merge --no-ff KokaKiwi-update-cryptpad-2024.3.1
git checkout main
git merge --squash KokaKiwi-update-cryptpad-2024.3.1
git checkout main
git merge --ff-only KokaKiwi-update-cryptpad-2024.3.1
git checkout main
git merge KokaKiwi-update-cryptpad-2024.3.1
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
maximilien
Labels
Clear labels
No items
No labels
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
2 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: Deuxfleurs/nixcfg#27
No description provided.
Delete branch "KokaKiwi/nixcfg:update-cryptpad-2024.3.1"

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?