diff options
| author | Byron Jones <glob@mozilla.com> | 2015-09-30 08:31:35 +0200 |
|---|---|---|
| committer | Byron Jones <glob@mozilla.com> | 2015-09-30 08:31:35 +0200 |
| commit | a7a445ae1d76c7f2d090a951267e20cb337ea7e9 (patch) | |
| tree | 682f4323221e470ae94d503104a2df8937c49d64 | |
| parent | 6050008216dda1d9ea3cb651ea329c8885fde1ae (diff) | |
| download | bugzilla-a7a445ae1d76c7f2d090a951267e20cb337ea7e9.tar.gz bugzilla-a7a445ae1d76c7f2d090a951267e20cb337ea7e9.tar.xz | |
Bug 1207721 - backed out for causing test failures
| -rwxr-xr-x | describekeywords.cgi | 2 | ||||
| -rwxr-xr-x | docker/generate_bmo_data.pl | 9 | ||||
| -rw-r--r-- | qa/config/generate_test_data.pl | 2 |
3 files changed, 10 insertions, 3 deletions
diff --git a/describekeywords.cgi b/describekeywords.cgi index 3850125cc..056f58269 100755 --- 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 632645877..bc314e1a6 100755 --- a/docker/generate_bmo_data.pl +++ b/docker/generate_bmo_data.pl @@ -340,6 +340,13 @@ my @groups = ( 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', no_admin => 0, @@ -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 ea4b7479f..824464967 100644 --- 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', |