Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1088399 - Add support for Github pull requests in See Also field. r=gerv, a=glob.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@265634 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bzrmirror%bugzilla.org 2014-10-24 08:31:42 +00:00
parent a270621669
commit d7b9945e24
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/webtools/bugzilla/.bzrrev
View File

@ -1 +1 @@
9181 9182

2
mozilla/webtools/bugzilla/.gitrev
View File

@ -1 +1 @@
d2685d0a7e2d75e3f334dc18babfcc53f53aa973 1d68680f1a510aa5fd7844dca3f8a681db334761

4
mozilla/webtools/bugzilla/Bugzilla/BugUrl/GitHub.pm
View File

@ -22,8 +22,10 @@ sub should_handle {
# GitHub issue URLs have only one form: # GitHub issue URLs have only one form:
# https://github.com/USER_OR_TEAM_OR_ORGANIZATION_NAME/REPOSITORY_NAME/issues/111 # 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' 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 { sub _check_value {

2
mozilla/webtools/bugzilla/template/en/default/global/user-error.html.tmpl
View File

@ -290,7 +290,7 @@
<li>A ticket in a Trac installation.</li> <li>A ticket in a Trac installation.</li>
<li>A b[% %]ug in a MantisBT installation.</li> <li>A b[% %]ug in a MantisBT installation.</li>
<li>A b[% %]ug on sourceforge.net.</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') %] [% Hook.process('bug_url_invalid_tracker') %]
</ul> </ul>
[% END %] [% END %]