aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Selsky <selsky@columbia.edu>2014-10-24 09:21:53 +0100
committerGervase Markham <gerv@gerv.net>2014-10-24 09:21:53 +0100
commit855faaab44d9e28349f7c9e3b45d7ea01eaaaf5d (patch)
tree58c0beb610afb930554ad2721c6320e90d85a787
parentbd9062bb8b409de5e7759bf588c1dbd0068f6067 (diff)
downloadbugs-855faaab44d9e28349f7c9e3b45d7ea01eaaaf5d.tar
bugs-855faaab44d9e28349f7c9e3b45d7ea01eaaaf5d.tar.gz
bugs-855faaab44d9e28349f7c9e3b45d7ea01eaaaf5d.tar.bz2
bugs-855faaab44d9e28349f7c9e3b45d7ea01eaaaf5d.tar.xz
bugs-855faaab44d9e28349f7c9e3b45d7ea01eaaaf5d.zip
Bug 1088399 - Add support for Github pull requests in See Also field. r=gerv, a=glob.
-rw-r--r--Bugzilla/BugUrl/GitHub.pm4
-rw-r--r--template/en/default/global/user-error.html.tmpl2
2 files changed, 4 insertions, 2 deletions
diff --git a/Bugzilla/BugUrl/GitHub.pm b/Bugzilla/BugUrl/GitHub.pm
index 22814dc50..f14f1d6b0 100644
--- a/Bugzilla/BugUrl/GitHub.pm
+++ b/Bugzilla/BugUrl/GitHub.pm
@@ -22,8 +22,10 @@ sub should_handle {
# GitHub issue URLs have only one form:
# https://github.com/USER_OR_TEAM_OR_ORGANIZATION_NAME/REPOSITORY_NAME/issues/111
+ # GitHub pull request URLs have only one form:
+ # https://github.com/USER_OR_TEAM_OR_ORGANIZATION_NAME/REPOSITORY_NAME/pull/111
return (lc($uri->authority) eq 'github.com'
- and $uri->path =~ m|^/[^/]+/[^/]+/issues/\d+$|) ? 1 : 0;
+ and $uri->path =~ m!^/[^/]+/[^/]+/(?:issues|pull)/\d+$!) ? 1 : 0;
}
sub _check_value {
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index ed0748760..81bfe7f30 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -290,7 +290,7 @@
<li>A ticket in a Trac installation.</li>
<li>A b[% %]ug in a MantisBT installation.</li>
<li>A b[% %]ug on sourceforge.net.</li>
- <li>An issue on github.com.</li>
+ <li>An issue/pull request on github.com.</li>
[% Hook.process('bug_url_invalid_tracker') %]
</ul>
[% END %]