diff --git a/_plugins/githubify.rb b/_plugins/githubify.rb index 0ccd3899f..c699dd5f5 100644 --- a/_plugins/githubify.rb +++ b/_plugins/githubify.rb @@ -26,9 +26,17 @@ def render(context) ## Convert #1234 into URL for the pull request ## If #1234 links to an issue, GitHub automatically redirects # - ## Require at least two digits to reduce false positive matches - output.gsub!(/#([0-9][0-9][0-9]*)/){ |s| - '' + s + '' + ## Main repository; forbid prefix of "/" to avoid conflation with + ## other monotree repos like bitcoin-core/gui. Require at least a + ## double-digit number to reduce false positive matches (e.g. "fix thing, + ## try #2") + output.gsub!(/(^|[^\/])#([0-9]+)/){ |s| + $1 + '#' + $2 + '' + } + + ## Other monotree repos; for repo "bitcoin-core/foo", PR format is "foo/#123" + output.gsub!(/([a-z]+)\/#([0-9]+)/){ |s| + '' + s + '' } ## Convert `123abcd` into URL for the commit diff --git a/_releases/0.14.1.md b/_releases/0.14.1.md index 94deb260e..95f5d9a08 100644 --- a/_releases/0.14.1.md +++ b/_releases/0.14.1.md @@ -117,7 +117,7 @@ git merge commit are mentioned. - #10133 `ab864d3` Clean up calculations of pcoinsTip memory usage (morcos) ### P2P protocol and network code -- #9953/#10013 `d2548a4` Fix shutdown hang with >= 8 -addnodes set (TheBlueMatt) +- #9953,#10013 `d2548a4` Fix shutdown hang with >= 8 -addnodes set (TheBlueMatt) - #10176 `30fa231` net: gracefully handle NodeId wrapping (theuni) ### Build system @@ -127,8 +127,8 @@ git merge commit are mentioned. - #10060 `ddc2dd1` Ensure an item exists on the rpcconsole stack before adding (achow101) ### Mining -- #9955/#10006 `569596c` Don't require segwit in getblocktemplate for segwit signalling or mining (sdaftuar) -- #9959/#10127 `b5c3440` Prevent slowdown in CreateNewBlock on large mempools (sdaftuar) +- #9955,#10006 `569596c` Don't require segwit in getblocktemplate for segwit signalling or mining (sdaftuar) +- #9959,#10127 `b5c3440` Prevent slowdown in CreateNewBlock on large mempools (sdaftuar) ### Tests and QA - #10157 `55f641c` Fix the `mempool_packages.py` test (sdaftuar)