From: Kohei Yoshino Date: Tue, 20 Nov 2018 22:46:33 +0000 (-0500) Subject: Bug 1452018 - Remove remaining Firefox OS and Marketplace references X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=674520dc90ef1415962ae35006eb1c1671095d41;p=thirdparty%2Fbugzilla.git Bug 1452018 - Remove remaining Firefox OS and Marketplace references --- diff --git a/Bugzilla/Search.pm b/Bugzilla/Search.pm index f419955dc..ca00a8aec 100644 --- a/Bugzilla/Search.pm +++ b/Bugzilla/Search.pm @@ -110,7 +110,6 @@ use Time::HiRes qw(gettimeofday tv_interval); # BMO - product aliases for searching use constant PRODUCT_ALIASES => { - 'Boot2Gecko' => 'Firefox OS', }; # When doing searches, NULL datetimes are treated as this date. diff --git a/Bugzilla/UserAgent.pm b/Bugzilla/UserAgent.pm index bd31a2a13..e3f941d6d 100644 --- a/Bugzilla/UserAgent.pm +++ b/Bugzilla/UserAgent.pm @@ -151,8 +151,6 @@ use constant OS_MAP => ( qr/\(.*Mac OS 8[^.].*\)/ => ["Mac System 8.0"], qr/\(.*Mac OS 8.*\)/ => ["Mac System 8.6"], qr/\(.*Darwin.*\)/ => [("Mac OS X 10.0", "Mac OS X")], - # Firefox OS - qr/\(Mobile;.*Gecko.*Firefox/ => ["Gonk (Firefox OS)"], # Silly qr/\(.*Mac.*PowerPC.*\)/ => ["Mac System 9.x"], qr/\(.*Mac.*PPC.*\)/ => ["Mac System 9.x"], diff --git a/extensions/BMO/Extension.pm b/extensions/BMO/Extension.pm index 8a447c958..2f92b5c40 100644 --- a/extensions/BMO/Extension.pm +++ b/extensions/BMO/Extension.pm @@ -1438,7 +1438,6 @@ sub install_update_db { "L20n" => 'l20n-security', "Legal" => 'legal', "Marketing" => 'marketing-private', - "Marketplace" => 'client-services-security', "Mozilla Communities" => 'mozilla-communities-security', "Mozilla Corporation" => 'mozilla-employee-confidential', "Mozilla Developer Network" => 'websites-security', diff --git a/extensions/BMO/bin/bug_1141452.pl b/extensions/BMO/bin/bug_1141452.pl deleted file mode 100755 index 869593802..000000000 --- a/extensions/BMO/bin/bug_1141452.pl +++ /dev/null @@ -1,104 +0,0 @@ -#!/usr/bin/perl -# 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. - -use strict; -use warnings; -use 5.10.1; - -use lib qw(. lib local/lib/perl5); - -BEGIN { - use Bugzilla; - Bugzilla->extensions; -} - -use Bugzilla::Constants qw( USAGE_MODE_CMDLINE ); -use Bugzilla::Extension::TrackingFlags::Flag; -use Bugzilla::User; - -Bugzilla->usage_mode(USAGE_MODE_CMDLINE); -my $dbh = Bugzilla->dbh; - -my $blocking_b2g = Bugzilla::Extension::TrackingFlags::Flag->check({ name => 'cf_blocking_b2g' }); -my $tracking_b2g = Bugzilla::Extension::TrackingFlags::Flag->check({ name => 'cf_tracking_b2g' }); - -die "tracking-b2g does not have a 'backlog' value\n" - unless grep { $_->value eq 'backlog' } @{ $tracking_b2g->values }; - -print "Searching for bugs..\n"; -my $flags = $dbh->selectall_arrayref(< {} }, $blocking_b2g->flag_id, $tracking_b2g->flag_id); - SELECT - bugs.bug_id, - blocking_b2g.id id, - tracking_b2g.value value - FROM - bugs - INNER JOIN tracking_flags_bugs blocking_b2g - ON blocking_b2g.bug_id = bugs.bug_id AND blocking_b2g.tracking_flag_id = ? - LEFT JOIN tracking_flags_bugs tracking_b2g - ON tracking_b2g.bug_id = bugs.bug_id AND tracking_b2g.tracking_flag_id = ? - WHERE - blocking_b2g.value = 'backlog' -EOF -die "No suitable bugs found\n" unless @$flags; -printf "About to fix %s bugs\n", scalar(@$flags); -print "Press to stop or to continue...\n"; -getc(); - -my $nobody = Bugzilla::User->check({ name => 'nobody@mozilla.org' }); -my $when = $dbh->selectrow_array('SELECT LOCALTIMESTAMP(0)'); - -$dbh->bz_start_transaction(); -foreach my $flag (@$flags) { - if (!$flag->{value}) { - print $flag->{bug_id}, ": changing blocking_b2g:backlog -> tracking_b2g:backlog\n"; - # no tracking_b2g value, change blocking_b2g:backlog -> tracking_b2g:backlog - $dbh->do( - "UPDATE tracking_flags_bugs SET tracking_flag_id = ? WHERE id = ?", - undef, - $tracking_b2g->flag_id, $flag->{id}, - ); - $dbh->do( - "UPDATE bugs SET delta_ts = ?, lastdiffed = ? WHERE bug_id = ?", - undef, - $when, $when, $flag->{bug_id}, - ); - $dbh->do( - "INSERT INTO bugs_activity(bug_id, who, bug_when, fieldid, removed, added) VALUES (?, ?, ?, ?, ?, ?)", - undef, - $flag->{bug_id}, $nobody->id, $when, $blocking_b2g->id, 'backlog', '---', - ); - $dbh->do( - "INSERT INTO bugs_activity(bug_id, who, bug_when, fieldid, removed, added) VALUES (?, ?, ?, ?, ?, ?)", - undef, - $flag->{bug_id}, $nobody->id, $when, $tracking_b2g->id, '---', 'backlog', - ); - } - elsif ($flag->{value}) { - print $flag->{bug_id}, ": deleting blocking_b2g:backlog\n"; - # tracking_b2g already has a value, just delete blocking_b2g:backlog - $dbh->do( - "DELETE FROM tracking_flags_bugs WHERE id = ?", - undef, - $flag->{id}, - ); - $dbh->do( - "UPDATE bugs SET delta_ts = ?, lastdiffed = ? WHERE bug_id = ?", - undef, - $when, $when, $flag->{bug_id}, - ); - $dbh->do( - "INSERT INTO bugs_activity(bug_id, who, bug_when, fieldid, removed, added) VALUES (?, ?, ?, ?, ?, ?)", - undef, - $flag->{bug_id}, $nobody->id, $when, $blocking_b2g->id, 'backlog', '---', - ); - } -} -$dbh->bz_commit_transaction(); - -print "Done.\n"; diff --git a/extensions/BMO/lib/Data.pm b/extensions/BMO/lib/Data.pm index 349f88093..bb11abd1c 100644 --- a/extensions/BMO/lib/Data.pm +++ b/extensions/BMO/lib/Data.pm @@ -105,7 +105,6 @@ tie(%$cf_visible_in_products, "Tie::IxHash", "Add-on SDK" => [], "addons.mozilla.org" => [], "Android Background Services" => [], - "B2GDroid" => [], "Calendar" => [], "Composer" => [], "Core" => [], @@ -196,7 +195,6 @@ tie(%$cf_visible_in_products, "Tie::IxHash", # Who to CC on particular bugmails when certain groups are added or removed. our %group_change_notification = ( 'addons-security' => ['amo-editors@mozilla.org'], - 'b2g-core-security' => ['security@mozilla.org'], 'bugzilla-security' => ['security@bugzilla.org'], 'client-services-security' => ['amo-admins@mozilla.org', 'web-security@mozilla.org'], 'cloud-services-security' => ['web-security@mozilla.org'], diff --git a/extensions/BMO/template/en/default/bug/create/comment-comm-newsletter.txt.tmpl b/extensions/BMO/template/en/default/bug/create/comment-comm-newsletter.txt.tmpl index e1dca9242..936784730 100644 --- a/extensions/BMO/template/en/default/bug/create/comment-comm-newsletter.txt.tmpl +++ b/extensions/BMO/template/en/default/bug/create/comment-comm-newsletter.txt.tmpl @@ -39,8 +39,6 @@ Marketing: [% IF cgi.param('area_marketing') %] Yes [% ELSE %] No [% END %] Engagement: [% IF cgi.param('area_engagement') %] Yes [% ELSE %] No [% END %] Firefox Desktop: [% IF cgi.param('area_firefox_desktop') %] Yes [% ELSE %] No [% END %] Firefox for Android: [% IF cgi.param('area_firefox_android') %] Yes [% ELSE %] No [% END %] -FirefoxOS: [% IF cgi.param('area_firefox_os') %] Yes [% ELSE %] No [% END %] -Marketplace: [% IF cgi.param('area_marketplace') %] Yes [% ELSE %] No [% END %] User Research/User Centered Design: [% IF cgi.param('area_user_research') %] Yes [% ELSE %] No [% END %] Security: [% IF cgi.param('area_security') %] Yes [% ELSE %] No [% END %] Support: [% IF cgi.param('area_support') %] Yes [% ELSE %] No [% END %] diff --git a/extensions/BMO/template/en/default/bug/create/create-comm-newsletter.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-comm-newsletter.html.tmpl index a51f8d741..b980ff9fc 100644 --- a/extensions/BMO/template/en/default/bug/create/create-comm-newsletter.html.tmpl +++ b/extensions/BMO/template/en/default/bug/create/create-comm-newsletter.html.tmpl @@ -178,7 +178,7 @@ function toggleAreaOther() {
What product or functional area does this opportunity relate to? Click - multiple areas if they apply (ie both Marketplace and UX) + multiple areas if they apply (ie both Security and UX)
Coding
Firefox Desktop
Firefox for Android
- Firefox OS
- Marketplace
User Research
@@ -236,7 +236,6 @@ YAHOO.util.Event.onDOMReady(function() {
- diff --git a/extensions/BMO/template/en/default/bug/create/create-finance.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-finance.html.tmpl index 473fd8478..c95d5fee9 100644 --- a/extensions/BMO/template/en/default/bug/create/create-finance.html.tmpl +++ b/extensions/BMO/template/en/default/bug/create/create-finance.html.tmpl @@ -170,7 +170,7 @@ - Which Initiative or Overall goal this purchase is for. i.e. B2G, Data Center, Network, etc.
+ Which Initiative or Overall goal this purchase is for. i.e. Data Center, Network, etc.
diff --git a/extensions/BMO/template/en/default/bug/create/create-intern.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-intern.html.tmpl index 4a36c0949..7c7a01680 100644 --- a/extensions/BMO/template/en/default/bug/create/create-intern.html.tmpl +++ b/extensions/BMO/template/en/default/bug/create/create-intern.html.tmpl @@ -164,7 +164,6 @@ $(document).ready(function() {
diff --git a/extensions/BMO/template/en/default/bug/create/create-mobile-compat.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-mobile-compat.html.tmpl index 31c5f98f0..37a7c3ab9 100644 --- a/extensions/BMO/template/en/default/bug/create/create-mobile-compat.html.tmpl +++ b/extensions/BMO/template/en/default/bug/create/create-mobile-compat.html.tmpl @@ -105,7 +105,6 @@ function validateAndSubmit() { diff --git a/extensions/BMO/template/en/default/bug/create/create-mozpr.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-mozpr.html.tmpl index d108feaa4..a723d6af3 100644 --- a/extensions/BMO/template/en/default/bug/create/create-mozpr.html.tmpl +++ b/extensions/BMO/template/en/default/bug/create/create-mozpr.html.tmpl @@ -460,10 +460,8 @@ function validate_form() { - - @@ -503,7 +501,6 @@ function validate_form() {