From ee4cd905ac9a044152e04868d577b3fabbcddaad Mon Sep 17 00:00:00 2001
From: "bzrmirror%bugzilla.org"
 <bzrmirror%bugzilla.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 19 Aug 2014 10:45:48 +0000
Subject: [PATCH] Bug 1053802: Groups used for the comment_taggers_group and
 debug_group parameters can be deleted r=sgreen a=glob

git-svn-id: svn://10.0.0.236/trunk@265502 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/webtools/bugzilla/.bzrrev                           | 2 +-
 mozilla/webtools/bugzilla/.gitrev                           | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/Group.pm                 | 6 ++++--
 mozilla/webtools/bugzilla/editgroups.cgi                    | 3 ---
 .../template/en/default/admin/groups/list.html.tmpl         | 3 ++-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/mozilla/webtools/bugzilla/.bzrrev b/mozilla/webtools/bugzilla/.bzrrev
index 79d3db49bf3..5f6c0a74297 100644
--- a/mozilla/webtools/bugzilla/.bzrrev
+++ b/mozilla/webtools/bugzilla/.bzrrev
@@ -1 +1 @@
-9112
\ No newline at end of file
+9113
\ No newline at end of file
diff --git a/mozilla/webtools/bugzilla/.gitrev b/mozilla/webtools/bugzilla/.gitrev
index d8935483ecf..d794534da5b 100644
--- a/mozilla/webtools/bugzilla/.gitrev
+++ b/mozilla/webtools/bugzilla/.gitrev
@@ -1 +1 @@
-c8c1e1984247d1f8d61b90fe4b772240f4fb7977
\ No newline at end of file
+6cae1b669d427648bf129be14d713ab63b1899da
\ No newline at end of file
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Group.pm b/mozilla/webtools/bugzilla/Bugzilla/Group.pm
index a750e353e22..07b78e3663b 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Group.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Group.pm
@@ -56,8 +56,10 @@ use constant UPDATE_COLUMNS => qw(
 );
 
 # Parameters that are lists of groups.
-use constant GROUP_PARAMS => qw(chartgroup insidergroup timetrackinggroup
-                                querysharegroup);
+use constant GROUP_PARAMS => qw(
+    chartgroup comment_taggers_group debug_group insidergroup
+    querysharegroup timetrackinggroup
+);
 
 ###############################
 ####      Accessors      ######
diff --git a/mozilla/webtools/bugzilla/editgroups.cgi b/mozilla/webtools/bugzilla/editgroups.cgi
index 2fd9f569a48..9c33a0ee3c6 100755
--- a/mozilla/webtools/bugzilla/editgroups.cgi
+++ b/mozilla/webtools/bugzilla/editgroups.cgi
@@ -22,9 +22,6 @@ use Bugzilla::Product;
 use Bugzilla::User;
 use Bugzilla::Token;
 
-use constant SPECIAL_GROUPS => ('chartgroup', 'insidergroup',
-                                'timetrackinggroup', 'querysharegroup');
-
 my $cgi = Bugzilla->cgi;
 my $dbh = Bugzilla->dbh;
 my $template = Bugzilla->template;
diff --git a/mozilla/webtools/bugzilla/template/en/default/admin/groups/list.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/admin/groups/list.html.tmpl
index 7a15703dfa6..29e39f65fc6 100644
--- a/mozilla/webtools/bugzilla/template/en/default/admin/groups/list.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/admin/groups/list.html.tmpl
@@ -75,7 +75,8 @@
    } 
 %]
 
-[% FOREACH group IN ["chartgroup", "insidergroup", "timetrackinggroup", "querysharegroup"] %]
+[% FOREACH group IN ["chartgroup", "comment_taggers_group", "debug_group",
+                     "insidergroup", "querysharegroup", "timetrackinggroup"] %]
   [% special_group = Param(group) %]
 
   [% IF special_group %]