Display conflict-free merge messages for pull requests

[justusbunsi]

External issue tracker often use a syntax like #1337 as item references in commits. When you handle pull requests with the default "merge commit" message, the very pull request will be referenced with # as well. Gitea itself can handle this situation and is able to identify both item and pull request reference when parsing the commit message.
If other external components (e.g.) push hooks ensure commits to only contain valid item references by looking for # occurrences, such commits would be rejected due to a non-valid issue reference.

Regarding the documentation, Gitea is able to use # and ! for item references for these use cases. This was handled only for squash merges

These changes take an external issue tracker into account when rendering merge commit messages. In such a case the documented ! will be used for item references in merge commits.

Signed-off-by: Steven Kriegler 61625851+justusbunsi@users.noreply.github.com

[zeripath]

@wULLSnpAXbWZGYDYyhWTKKspEQoaYxXyhoisqHf I suspect that this needs a second check to work for your situation?

[wULLSnpAXbWZGYDYyhWTKKspEQoaYxXyhoisqHf]

@wULLSnpAXbWZGYDYyhWTKKspEQoaYxXyhoisqHf I suspect that this needs a second check to work for your situation?

Thanks for bringing me in!
Currently building with this patch.
How exactly would I be supposed to check, though? I should probably give it a proper look 🙈 Give me a minute, please.

[zeripath]

Actually @wULLSnpAXbWZGYDYyhWTKKspEQoaYxXyhoisqHf you wouldn't use this - so I think you're fine. Sorry for wasting your time.

[wULLSnpAXbWZGYDYyhWTKKspEQoaYxXyhoisqHf]

Actually @wULLSnpAXbWZGYDYyhWTKKspEQoaYxXyhoisqHf you wouldn't use this - so I think you're fine. Sorry for wasting your time.

yeah, no worries, now I see I'm not affected since I disable PRs for the mirrors and here it's if pr.BaseRepo.UnitEnabled(UnitTypeExternalTracker)..
This patch looks good, though.

Still, I have one interesting observation.
I briefly tried enabling PRs for the Gitea mirror I have, while the issue tracker is still set as shown here and while everything is still properly linking, I see no pulls tab.
It's not a result of this PR, so I suppose it must have been part of any of the recent changes.

[codecov-commenter]

Codecov Report

Merging #15773 (23c3c7a) into main (e22ee46) will decrease coverage by 0.01%.
The diff coverage is 62.50%.

@@            Coverage Diff             @@
##             main   #15773      +/-   ##
==========================================
- Coverage   43.99%   43.97%   -0.02%     
==========================================
  Files         678      678              
  Lines       82016    82022       +6     
==========================================
- Hits        36081    36070      -11     
- Misses      40065    40077      +12     
- Partials     5870     5875       +5     

Impacted Files	Coverage Δ
models/pull.go	55.13% <62.50%> (+0.80%)	⬆️
modules/util/timer.go	42.85% <0.00%> (-42.86%)	⬇️
services/pull/temp_repo.go	26.59% <0.00%> (-3.20%)	⬇️
services/pull/check.go	26.02% <0.00%> (-2.74%)	⬇️
modules/process/manager.go	72.83% <0.00%> (-2.47%)	⬇️
services/pull/patch.go	54.23% <0.00%> (-1.70%)	⬇️
modules/log/file.go	73.80% <0.00%> (-1.59%)	⬇️

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update e22ee46...23c3c7a. Read the comment docs.