diff options
| author | zeripath <art27@cantab.net> | 2021-05-09 03:32:48 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-09 10:32:48 +0800 |
| commit | 76d6184cd0f09f51aa2534092b553e47ee703ff3 (patch) | |
| tree | e17dad5d8fee2030014d2cc99cac856f01db548e /integrations/xss_test.go | |
| parent | d644709b22bd1872e78a0938dec7eb77d5ed03f3 (diff) | |
| download | gitea-76d6184cd0f09f51aa2534092b553e47ee703ff3.tar.gz gitea-76d6184cd0f09f51aa2534092b553e47ee703ff3.zip | |
Display conflict-free merge messages for pull requests (#15773) (#15796)
Backport #15773
Repositories using external issue tracker tend to use numeric issues in
commits. To prevent conflicts during issue reference parsing or inside
commit hooks, this change respects these configuration and uses the !
character to refer to pull requests in merge commit messages.
For repositories using squash merges, this was already handled.
Signed-off-by: JustusBunsi <61625851+justusbunsi@users.noreply.github.com>
Co-authored-by: zeripath <art27@cantab.net>
Co-authored-by: Steven <61625851+justusbunsi@users.noreply.github.com>
Diffstat (limited to 'integrations/xss_test.go')
0 files changed, 0 insertions, 0 deletions