Dzahn has submitted this change and it was merged.

Change subject: Add link in gitblit for phabricator
......................................................................


Add link in gitblit for phabricator

Gerrit now highlights bug: when also using phabricator now.

Note: this has been tested and works for me.

Change-Id: I54124646c16f7f97621abdc6fe3347349d266ff1
---
M modules/gerrit/templates/gerrit.config.erb
M modules/gitblit/files/gitblit.properties
2 files changed, 8 insertions(+), 0 deletions(-)

Approvals:
  Paladox: Looks good to me, but someone else must approve
  jenkins-bot: Checked
  Dzahn: Verified; Looks good to me, approved



diff --git a/modules/gerrit/templates/gerrit.config.erb 
b/modules/gerrit/templates/gerrit.config.erb
index c142bdd..c01406c 100644
--- a/modules/gerrit/templates/gerrit.config.erb
+++ b/modules/gerrit/templates/gerrit.config.erb
@@ -78,6 +78,9 @@
 [commentlink "bugzilla"]
     match =  "\\b[bB][uU][gG]\\:?\\s+#?(\\d+)\\b"
     link = https://bugzilla.wikimedia.org/$1
+[commentlink "phabricator"]
+    match = "\\b[bB][uU][gG]\\:?\\s+#?(T\\d+)\\b"
+    link = https://phabricator.wikimedia.org/$1
 [commentlink "codereview"]
     match = \\br(\\d+)\\b
     link = https://phabricator.wikimedia.org/rSVN$1
@@ -138,6 +141,10 @@
     footer = Bug:
     match = "\\#?\\d{1,6}"
     system = Bugzilla
+[trackingid "phabricator"]
+    footer = Bug:
+    match = "\\#?\\d{1,6}"
+    system = Phabricator
 [changeMerge]
     test = true
     checkFrequency = 0
diff --git a/modules/gitblit/files/gitblit.properties 
b/modules/gitblit/files/gitblit.properties
index a6e1cf9..080fc5b 100644
--- a/modules/gitblit/files/gitblit.properties
+++ b/modules/gitblit/files/gitblit.properties
@@ -1005,6 +1005,7 @@
 regex.global.changeid = \\b(I[0-9a-f]{7,40})\\b!!!<a 
href="https://gerrit.wikimedia.org/r/#q,$1,n,z";>$1</a>
 regex.global.commit = \\b([0-9a-f]{7,40})\\b!!!<a 
href="https://gerrit.wikimedia.org/r/#q,$1,n,z";>$1</a>
 regex.global.bugzilla = \\b([bB][uU][gG]\\:?\\s+#?(\\d+))\\b!!!<a 
href="https://bugzilla.wikimedia.org/$2";>$1</a>
+regex.global.phabricator = \\b([bB][uU][gG]\\:?\\s+#?(T\\d+))\\b!!!<a 
href="https://phabricator.wikimedia.org/$2";>$1</a>
 regex.global.codereview = \\br(\\d+)\\b!!!<a 
href="https://www.mediawiki.org/wiki/Special:CodeReview/MediaWiki/$1";>$1</a>
 regex.global.rt = \\b([rR][tT]\\:?\\s+#?(\\d+))\\b!!!<a 
href="https://rt.wikimedia.org/Ticket/Display.html?id=$2";>$1</a>
 regex.global.cve = \\b(CVE\\-\\d{4}\\-\\d+)\\b!!!<a 
href="https://cve.mitre.org/cgi-bin/cvename.cgi?name=$1";>$1</a>

-- 
To view, visit https://gerrit.wikimedia.org/r/215247
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I54124646c16f7f97621abdc6fe3347349d266ff1
Gerrit-PatchSet: 21
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Paladox <thomasmulhall...@yahoo.com>
Gerrit-Reviewer: 20after4 <mmod...@wikimedia.org>
Gerrit-Reviewer: Brian Wolff <bawolff...@gmail.com>
Gerrit-Reviewer: Chad <ch...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: Paladox <thomasmulhall...@yahoo.com>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to