Bug 1207721 - backed out for causing test failures

diff --git a/describekeywords.cgi b/describekeywords.cgi
index 3850125cc8363faea79bd1b4c97e44acb4ca19fa..056f582698a0954baaba626def991ef0fbc2b5b0 100755 (executable)
--- a/describekeywords.cgi
+++ b/describekeywords.cgi
@@ -40,7 +40,7 @@ Bugzilla->switch_to_shadow_db;
 
 # Hide bug counts for security keywords from users who aren't a member of the
 # security group
-my $can_see_security = Bugzilla->user->in_group('core-security-release');
+my $can_see_security = Bugzilla->user->in_group('core-security');
 my $keywords = Bugzilla::Keyword->get_all_with_bug_count();
 foreach my $keyword (@$keywords) {
     $keyword->{'bug_count'} = 0

diff --git a/docker/generate_bmo_data.pl b/docker/generate_bmo_data.pl
index 632645877b554d9cf30adedab8c425b828ae1e4f..bc314e1a62b5bb217cebe8ba315629441bc1f3a8 100755 (executable)
--- a/docker/generate_bmo_data.pl
+++ b/docker/generate_bmo_data.pl
@@ -339,6 +339,13 @@ my @groups = (
         bug_group    => 1,
         all_products => 1,
     },
+    {
+        name         => 'core-security-release',
+        description  => 'Release-track Client Security Bug',
+        no_admin     => 1,
+        bug_group    => 1,
+        all_products => 1,
+    },
     {
         name         => 'can_edit_comments',
         description  => 'Members of this group will be able to edit comments',
@@ -420,7 +427,7 @@ my %set_params = (
                                  '&long_desc_type=substring',
     defaultseverity           => 'normal',
     edit_comments_group       => 'can_edit_comments',
-    insidergroup              => 'core-security-release',
+    insidergroup              => 'core-security',
     last_visit_keep_days      => '28',
     lxr_url                   => 'http://mxr.mozilla.org/mozilla',
     lxr_root                  => 'mozilla/',

diff --git a/qa/config/generate_test_data.pl b/qa/config/generate_test_data.pl
index ea4b7479f85671d058a331c9d661c84c7801ba9b..8244649670eb04dfe6bdce3165b96bfeba5557d2 100644 (file)
--- a/qa/config/generate_test_data.pl
+++ b/qa/config/generate_test_data.pl
@@ -564,7 +564,7 @@ $dbh->do('INSERT INTO group_group_map VALUES (?, ?, 0)',
          undef, $editbugs->id, $canconfirm->id);
 
 # BMO: Update default security group settings for new products
-my $default_security_group = Bugzilla::Group->new({ name => 'core-security-release' });
+my $default_security_group = Bugzilla::Group->new({ name => 'core-security' });
 $default_security_group ||= Bugzilla::Group->new({ name => 'Master' });
 if ($default_security_group) {
     $dbh->do('UPDATE products SET security_group_id = ? WHERE security_group_id IS NULL',