summaryrefslogtreecommitdiffstats
path: root/src/main/distrib
diff options
context:
space:
mode:
authorPaul Martin <paul@paulsputer.com>2016-04-27 23:58:06 +0100
committerPaul Martin <paul@paulsputer.com>2016-04-27 23:58:06 +0100
commitc2188a840bc4153ae92112b04b2e06a90d3944aa (patch)
treec11b48170773fcf1edfc53def832fe5a9b76f1c0 /src/main/distrib
parent56619e42f0a1e555c004374e7f2b13f744ab23f5 (diff)
downloadgitblit-c2188a840bc4153ae92112b04b2e06a90d3944aa.tar.gz
gitblit-c2188a840bc4153ae92112b04b2e06a90d3944aa.zip
Ticket Reference handling #1048
+ Supports referencing: + Tickets from other tickets via comments + Tickets from commits on any branch + Common TicketLink class used for both commits and tickets + TicketLink is temporary and persisted to ticket as a Reference + Support deletion of ticket references + Rebasing patchsets/branches will generate new references + Deleting old patchsets/branches will remove the relevant references + Substantial testing of use cases + With and without patchsets, deleting, amending + BranchTicketService used during testing to allow end-to-end ref testing + Relocated common git helper functions to JGitUtils
Diffstat (limited to 'src/main/distrib')
-rw-r--r--src/main/distrib/data/defaults.properties7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/main/distrib/data/defaults.properties b/src/main/distrib/data/defaults.properties
index 403b7417..0c7d6cd4 100644
--- a/src/main/distrib/data/defaults.properties
+++ b/src/main/distrib/data/defaults.properties
@@ -574,6 +574,13 @@ tickets.requireApproval = false
# SINCE 1.5.0
tickets.closeOnPushCommitMessageRegex = (?:fixes|closes)[\\s-]+#?(\\d+)
+# The case-insensitive regular expression used to identify and link tickets on
+# push to the commits based on commit message. In the case of a patchset
+# self references are ignored
+#
+# SINCE 1.8.0
+tickets.linkOnPushCommitMessageRegex = (?:ref|task|issue|bug)?[\\s-]*#(\\d+)
+
# Specify the location of the Lucene Ticket index
#
# SINCE 1.4.0