diff options
| author | Dave Lawrence <dlawrence@mozilla.com> | 2012-10-17 16:19:16 +0200 |
|---|---|---|
| committer | Dave Lawrence <dlawrence@mozilla.com> | 2012-10-17 16:19:16 +0200 |
| commit | 6ccf498c671f9e69ad6c316bbcf7a967760b6e7b (patch) | |
| tree | c367cf521b776f8b372547b444c63237325776b4 | |
| parent | bb85be28137ca2a822eb8164421072d8a088661e (diff) | |
| download | bugzilla-6ccf498c671f9e69ad6c316bbcf7a967760b6e7b.tar.gz bugzilla-6ccf498c671f9e69ad6c316bbcf7a967760b6e7b.tar.xz | |
Bug 802451 - backport bug 704999 to bmo (GitHub URLs aren't working in the "Add Bug URLs" field)
| -rw-r--r-- | Bugzilla/BugUrl.pm | 1 | ||||
| -rw-r--r-- | Bugzilla/BugUrl/GitHub.pm | 36 | ||||
| -rw-r--r-- | template/en/default/global/user-error.html.tmpl | 1 |
3 files changed, 38 insertions, 0 deletions
diff --git a/Bugzilla/BugUrl.pm b/Bugzilla/BugUrl.pm index 837c0d4fe..784600984 100644 --- a/Bugzilla/BugUrl.pm +++ b/Bugzilla/BugUrl.pm @@ -69,6 +69,7 @@ use constant SUB_CLASSES => qw( Bugzilla::BugUrl::Trac Bugzilla::BugUrl::MantisBT Bugzilla::BugUrl::SourceForge + Bugzilla::BugUrl::GitHub ); ############################### diff --git a/Bugzilla/BugUrl/GitHub.pm b/Bugzilla/BugUrl/GitHub.pm new file mode 100644 index 000000000..63be65bed --- /dev/null +++ b/Bugzilla/BugUrl/GitHub.pm @@ -0,0 +1,36 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +# This Source Code Form is "Incompatible With Secondary Licenses", as +# defined by the Mozilla Public License, v. 2.0. + +package Bugzilla::BugUrl::GitHub; +use strict; +use base qw(Bugzilla::BugUrl); + +############################### +#### Methods #### +############################### + +sub should_handle { + my ($class, $uri) = @_; + + # GitHub issue URLs have only one form: + # https://github.com/USER_OR_TEAM_OR_ORGANIZATION_NAME/REPOSITORY_NAME/issues/111 + return ($uri->authority =~ /^github.com$/i + and $uri->path =~ m|^/[^/]+/[^/]+/issues/\d+$|) ? 1 : 0; +} + +sub _check_value { + my ($class, $uri) = @_; + + $uri = $class->SUPER::_check_value($uri); + + # GitHub HTTP URLs redirect to HTTPS, so just use the HTTPS scheme. + $uri->scheme('https'); + + return $uri; +} + +1; diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl index b3257cea5..713dfc36f 100644 --- a/template/en/default/global/user-error.html.tmpl +++ b/template/en/default/global/user-error.html.tmpl @@ -272,6 +272,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> </ul> [% ELSIF reason == 'id' %] There is no valid [% terms.bug %] id in that URL. |