diff --git a/mozilla/webtools/bugzilla/.bzrrev b/mozilla/webtools/bugzilla/.bzrrev index f9a554daa14..5f5445043d1 100644 --- a/mozilla/webtools/bugzilla/.bzrrev +++ b/mozilla/webtools/bugzilla/.bzrrev @@ -1 +1 @@ -9181 \ No newline at end of file +9182 \ No newline at end of file diff --git a/mozilla/webtools/bugzilla/.gitrev b/mozilla/webtools/bugzilla/.gitrev index b7b433768fe..4c2cbb48966 100644 --- a/mozilla/webtools/bugzilla/.gitrev +++ b/mozilla/webtools/bugzilla/.gitrev @@ -1 +1 @@ -d2685d0a7e2d75e3f334dc18babfcc53f53aa973 \ No newline at end of file +1d68680f1a510aa5fd7844dca3f8a681db334761 \ No newline at end of file diff --git a/mozilla/webtools/bugzilla/Bugzilla/BugUrl/GitHub.pm b/mozilla/webtools/bugzilla/Bugzilla/BugUrl/GitHub.pm index 22814dc50e1..f14f1d6b05c 100644 --- a/mozilla/webtools/bugzilla/Bugzilla/BugUrl/GitHub.pm +++ b/mozilla/webtools/bugzilla/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/mozilla/webtools/bugzilla/template/en/default/global/user-error.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/global/user-error.html.tmpl index ed074876080..81bfe7f30a0 100644 --- a/mozilla/webtools/bugzilla/template/en/default/global/user-error.html.tmpl +++ b/mozilla/webtools/bugzilla/template/en/default/global/user-error.html.tmpl @@ -290,7 +290,7 @@
  • A ticket in a Trac installation.
  • A b[% %]ug in a MantisBT installation.
  • A b[% %]ug on sourceforge.net.
  • -
  • An issue on github.com.
  • +
  • An issue/pull request on github.com.
  • [% Hook.process('bug_url_invalid_tracker') %] [% END %]