Commit Graph

32 Commits (main)

Author SHA1 Message Date
Andy Wilkinson 50d8b20d6c Re-enable forward merge issues for merges into main 1 year ago
Andy Wilkinson b9c2c289b3 Start working on Spring Boot 3.2
This commit also disables the creation of forward merge issues
when merging into main. Forward merge issues will be re-enabled
once 3.1.1 has been released.
1 year ago
Andy Wilkinson 63abaa4cd2 Start working on 3.1.0 2 years ago
Moritz Halbritter 4d2b389248 Merge branch '2.7.x' 2 years ago
Moritz Halbritter c72dd7de1a Fix typo in forward-merge script 2 years ago
Johnny Lim 90589fd6d4 Polish
See gh-33384
2 years ago
Andy Wilkinson 430f033381 Create forward port issues for merges into main
This reverts commit 4e884b27f8.

Closes gh-31148
3 years ago
Stephane Nicoll 63e8117d49 Merge branch '2.7.x' 3 years ago
Stephane Nicoll 0233dc035f Merge branch '2.6.x' into 2.7.x
Closes gh-30334
3 years ago
Stephane Nicoll 1cfebc0d39 Merge branch '2.5.x' into 2.6.x
Closes gh-30333
3 years ago
Mohammad Semnani 677787bd0a Fix typo in forward-merge log message
See gh-30332
3 years ago
Andy Wilkinson 4e884b27f8 Don't create forward port issues for merges into main 3 years ago
Andy Wilkinson e06b0d97f7 Update main branch to start work on 3.0.x 3 years ago
Andy Wilkinson 86a773a8e9 Update main branch to start work on 2.7.x 3 years ago
dreis2211 9d344b1e18 Update some more references to 2.5.x
See gh-26861
3 years ago
Andy Wilkinson 258ae73aa4 Update prepare-forward-merge following master->main rename
See gh-26248
4 years ago
Andy Wilkinson 94e17d23ef Create issue for each forward merge found in commit message
Closes gh-25586
4 years ago
Stephane Nicoll 40fd71bc05 Switch master branch to 2.5.x 4 years ago
Scott Frederick e5ec6dfef0 Find nearest milestone for forward merge with .x pattern
Fixes gh-22350
4 years ago
Phillip Webb 97d4613fba Refine prepare-forward-merge to detect master 5 years ago
Phillip Webb c8e966002a Fixup prepare-forward-merge for master
Fix the regex so that merges to master are supported.
5 years ago
Phillip Webb 10fdd65063 Add prepare-forward-merge script
Add a git hook script that can be used to prepare a sensible merge
commit message.

Closes gh-21688
5 years ago
Phillip Webb 39caf45155 Allow forward merge to work with .x patterns
Closes gh-21687
5 years ago
Phillip Webb 4a6e08c817 Add logging to forward-merge script
Add some logging to aid with development.
5 years ago
Phillip Webb b6474f2ca1 Remove accidentally committed hook file 5 years ago
Phillip Webb eddbfb34f7 Merge branch '2.1.x'
Closes gh-17258
5 years ago
Phillip Webb ffbb23bc6d Always use credentials in forward merge script
Closes gh-17257
5 years ago
Phillip Webb 7ed0faa574 Merge branch '2.1.x'
Closes gh-17088
6 years ago
Phillip Webb ef09ee5dea Add new line when rewriting git message
Update the forward merge script to add an additional new line when
rewiring the commit message. Prior this this commit, if an additional
line immediately followed the "Fixes ... in ..." pattern it would be
appended to the end of the rewritten fixes line.

Closes gh-16861
6 years ago
Andy Wilkinson 95149cd7cb Make it easier to identify issues created for forward ports
Closes gh-16566
6 years ago
Andy Wilkinson 7175b80669 Output information about issue created for forward merge
See gh-16458
6 years ago
Andy Wilkinson 58c9412c09 Add forward merge issue creation hook
Closes gh-16458
6 years ago