Commit Graph

15 Commits

Author SHA1 Message Date
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.
2023-06-08 17:22:21 +01:00
Andy Wilkinson 63abaa4cd2 Start working on 3.1.0 2023-01-23 12:04:39 +00:00
Moritz Halbritter 4d2b389248 Merge branch '2.7.x' 2023-01-16 13:53:25 +01:00
Moritz Halbritter c72dd7de1a Fix typo in forward-merge script 2023-01-16 13:53:18 +01:00
Johnny Lim 90589fd6d4 Polish
See gh-33384
2022-12-01 11:32:39 +01:00
Andy Wilkinson 430f033381 Create forward port issues for merges into main
This reverts commit 4e884b27f8.

Closes gh-31148
2022-05-23 11:17:47 +01:00
Andy Wilkinson 4e884b27f8 Don't create forward port issues for merges into main 2021-11-30 15:14:33 +00:00
Andy Wilkinson e06b0d97f7 Update main branch to start work on 3.0.x 2021-11-30 15:07:24 +00:00
Andy Wilkinson 86a773a8e9 Update main branch to start work on 2.7.x 2021-11-30 11:16:53 +00:00
dreis2211 9d344b1e18 Update some more references to 2.5.x
See gh-26861
2021-06-11 11:54:34 +01:00
Andy Wilkinson 258ae73aa4 Update prepare-forward-merge following master->main rename
See gh-26248
2021-04-27 11:56:10 +01:00
Stephane Nicoll 85d0f95f7a Start work on Spring Boot 2.5
Closes gh-24491
2020-12-14 14:35:37 +01:00
Phillip Webb 97d4613fba Refine prepare-forward-merge to detect master 2020-06-05 16:21:36 -07:00
Phillip Webb c8e966002a Fixup prepare-forward-merge for master
Fix the regex so that merges to master are supported.
2020-06-05 15:36:09 -07:00
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
2020-06-04 20:10:09 -07:00