Commit Graph

16 Commits

Author SHA1 Message Date
Andy Wilkinson
94e17d23ef Create issue for each forward merge found in commit message
Closes gh-25586
2021-03-10 17:30:15 +00:00
Stephane Nicoll
40fd71bc05 Switch master branch to 2.5.x 2020-12-14 14:31:25 +01:00
Scott Frederick
e5ec6dfef0 Find nearest milestone for forward merge with .x pattern
Fixes gh-22350
2020-07-15 17:04:34 -05: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
Phillip Webb
39caf45155 Allow forward merge to work with .x patterns
Closes gh-21687
2020-06-04 20:05:17 -07:00
Phillip Webb
4a6e08c817 Add logging to forward-merge script
Add some logging to aid with development.
2020-06-04 20:05:01 -07:00
Phillip Webb
b6474f2ca1 Remove accidentally committed hook file 2020-06-04 13:59:14 -07:00
Phillip Webb
eddbfb34f7 Merge branch '2.1.x'
Closes gh-17258
2019-06-18 15:08:54 -07:00
Phillip Webb
ffbb23bc6d Always use credentials in forward merge script
Closes gh-17257
2019-06-18 15:08:09 -07:00
Phillip Webb
7ed0faa574 Merge branch '2.1.x'
Closes gh-17088
2019-06-07 21:03:13 -07:00
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
2019-05-28 13:30:13 -07:00
Andy Wilkinson
95149cd7cb Make it easier to identify issues created for forward ports
Closes gh-16566
2019-04-15 16:59:27 +01:00
Andy Wilkinson
7175b80669 Output information about issue created for forward merge
See gh-16458
2019-04-04 15:07:39 +01:00
Andy Wilkinson
58c9412c09 Add forward merge issue creation hook
Closes gh-16458
2019-04-04 13:24:40 +01:00