Redmine

Rebase

Prepare your workspace:

git clone [email protected]:naivesystems/redmine.git
cd redmine/
git remote add upstream https://github.com/redmine/redmine.git
git fetch --tags upstream
git checkout 5.0.6
git switch -c rebase/5.0.6

Now you need to find out the patches to rebase. Usually this is from a previous rebase branch.

git log --oneline rebase/5.0.5

The output will look like

6ec6e67ad303 (tag: 5.0.5+nsbox.20231018, origin/rebase/5.0.5) nsbox: fix an error during db:migrate
dbb786250a94 (tag: 5.0.5+nsbox.20230903) nsbox: disable auth sources
d62aca31da53 nsbox: user form: make login and mail fields readonly
d9ca55277edd nsbox: hide more user deletion / password change UI
b2d300cc45de (tag: 5.0.5+nsbox.20230902) nsbox: change sign out link
69210b04e25e nsbox: simplify mails from issue edits
3eacf510c5fa nsbox: add "Close sidebar" link button
1829c6cfc647 nsbox: remember group-by collapse states
bb75d56281d2 nsbox: grey out closed issues
ba99e3ebe54e nsbox: set issue link target
2e12b6277f4e nsbox: disable user creation and deletion forms
9e8d81116d6a nsbox: disallow password changes
d29b90744795 nsbox: add rake task to export admin API key
d20cb1cfdc53 nsbox: auto-login based on X-Remote-User header
fc841436a713 (tag: 5.0.5) Tagged version 5.0.5

We will need fc841436a713 and 6ec6e67ad303.

git cherry-pick fc841436a713..6ec6e67ad303

Resolve conflicts if any. When you are finished, push to create the branch:

git push origin rebase/5.0.6

Release

https://github.com/naivesystems/redmine/releases/new