diff --git a/extensions/BMO/bin/export_bmo_etl.pl b/extensions/BMO/bin/export_bmo_etl.pl index 385e57c59e..46ea0ac94e 100644 --- a/extensions/BMO/bin/export_bmo_etl.pl +++ b/extensions/BMO/bin/export_bmo_etl.pl @@ -21,6 +21,7 @@ use Bugzilla::User; use Bugzilla::FlagActivity; +use English qw(-no_match_vars $PID); use HTTP::Headers; use HTTP::Request; use IO::Compress::Gzip qw(gzip $GzipError); @@ -82,7 +83,7 @@ $lock_wait //= LOCK_MAX_WAIT; # Identifies this run in the lock table and in staging table names -my $run_id = time() . "_$$"; +my $run_id = time() . "_$PID"; # Create a hash for faster checking later my %no_cache = map { $_ => 1 } @no_cache; diff --git a/extensions/BMO/template/en/default/bug/create/github-admin.html.tmpl b/extensions/BMO/template/en/default/bug/create/github-admin.html.tmpl new file mode 100644 index 0000000000..8c796194d6 --- /dev/null +++ b/extensions/BMO/template/en/default/bug/create/github-admin.html.tmpl @@ -0,0 +1,23 @@ +[%# 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. + #%] + +[% RETURN UNLESS product.name == 'mozilla.org' %] + +
+
+ +
+
+

+ This request path for GHE support will be deprecated on October 30. Starting in November 2026, please + submit your GitHub Enterprise requests through Jira instead. + The new documentation hub can also be found in + Confluence. +

+
+
diff --git a/extensions/BMO/template/en/default/hook/bug/create/create-end.html.tmpl b/extensions/BMO/template/en/default/hook/bug/create/create-end.html.tmpl index 3719d0f597..c81c9df38e 100644 --- a/extensions/BMO/template/en/default/hook/bug/create/create-end.html.tmpl +++ b/extensions/BMO/template/en/default/hook/bug/create/create-end.html.tmpl @@ -7,3 +7,4 @@ #%] [% INCLUDE "bug/create/bugzilla-admin.html.tmpl" %] +[% INCLUDE "bug/create/github-admin.html.tmpl" %] diff --git a/extensions/BMO/template/en/default/hook/bug_modal/create-before_modules.html.tmpl b/extensions/BMO/template/en/default/hook/bug_modal/create-before_modules.html.tmpl index ed940541d7..6d69d31e23 100644 --- a/extensions/BMO/template/en/default/hook/bug_modal/create-before_modules.html.tmpl +++ b/extensions/BMO/template/en/default/hook/bug_modal/create-before_modules.html.tmpl @@ -7,5 +7,5 @@ #%] [% INCLUDE "bug/create/bugzilla-admin.html.tmpl" %] - +[% INCLUDE "bug/create/github-admin.html.tmpl" %] [% INCLUDE "bug/create/custom-forms-message.html.tmpl" %]