diff options
| author | Matt Selsky <selsky@columbia.edu> | 2014-10-24 10:22:20 +0200 |
|---|---|---|
| committer | Gervase Markham <gerv@gerv.net> | 2014-10-24 10:22:20 +0200 |
| commit | 1d68680f1a510aa5fd7844dca3f8a681db334761 (patch) | |
| tree | 7da8d21d77f5ed8ab5dcee46610316debc7b3118 | |
| parent | d2685d0a7e2d75e3f334dc18babfcc53f53aa973 (diff) | |
| download | bugzilla-1d68680f1a510aa5fd7844dca3f8a681db334761.tar.gz bugzilla-1d68680f1a510aa5fd7844dca3f8a681db334761.tar.xz | |
Bug 1088399 - Add support for Github pull requests in See Also field. r=gerv, a=glob.
| -rw-r--r-- | Bugzilla/BugUrl/GitHub.pm | 4 | ||||
| -rw-r--r-- | template/en/default/global/user-error.html.tmpl | 2 |
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 %] |