mirror of
1
Fork 0
forgejo/services/pull
Jimmy Praet 06f483d0c4
Append to existing trailers in generated squash commit message (#15980)
* Remove superfluous newline before Co-authored-by trailers

* Append to existing PR description trailer section

If the existing PR description message already contains a trailer section (e.g. Signed-off-by: ),
append to it instead of creating a new trailer section.

* Reuse compiled regexp

* Simplify regex and deal with trailing \n in PR description

* Add tests for CommitMessageTrailersPattern

- add support for Key:Value (no space after colon)
- add support for whitespace "folding"

* Update services/pull/pull_test.go

Co-authored-by: Norwin <noerw@users.noreply.github.com>

Co-authored-by: zeripath <art27@cantab.net>
Co-authored-by: Norwin <noerw@users.noreply.github.com>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
2021-06-25 13:01:43 -04:00
..
check.go Remove unnecessary goroutine (#16080) 2021-06-09 15:52:55 -04:00
check_test.go Multiple Queue improvements: LevelDB Wait on empty, shutdown empty shadow level queue, reduce goroutines etc (#15693) 2021-05-15 16:22:26 +02:00
commit_status.go [Refactor] CombinedStatus and CommitStatus related functions & structs (#14026) 2020-12-18 11:33:32 +08:00
lfs.go Add LFS Migration and Mirror (#14726) 2021-04-08 18:25:57 -04:00
main_test.go Move some pull request functions from models to services (#9266) 2019-12-06 21:44:10 -05:00
merge.go Always set the merge base used to merge the commit (#15352) 2021-04-10 09:27:29 +01:00
patch.go Make manual merge autodetection optional and add manual merge as merge method (#12543) 2021-03-03 22:41:23 -05:00
pull.go Append to existing trailers in generated squash commit message (#15980) 2021-06-25 13:01:43 -04:00
pull_test.go Append to existing trailers in generated squash commit message (#15980) 2021-06-25 13:01:43 -04:00
review.go Add attachments for PR reviews (#16075) 2021-06-14 21:12:33 -04:00
temp_repo.go Handle more pathological branch and tag names (#11843) 2020-06-11 19:49:47 -04:00
update.go IsUserAllowedToUpdate ignore igonre if user is nil (#14885) 2021-03-04 19:27:54 +01:00