summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Bugzilla/DB.pm4
-rw-r--r--contrib/gnats2bz.pl2
-rw-r--r--docs/images/bzLifecycle.xml4
-rw-r--r--template/en/default/global/field-descs.none.tmpl2
4 files changed, 4 insertions, 8 deletions
diff --git a/Bugzilla/DB.pm b/Bugzilla/DB.pm
index 9378054b3..077f93cf7 100644
--- a/Bugzilla/DB.pm
+++ b/Bugzilla/DB.pm
@@ -68,8 +68,8 @@ use constant ENUM_DEFAULTS => {
rep_platform => ["All","PC","Macintosh","Other"],
bug_status => ["UNCONFIRMED","NEW","ASSIGNED","REOPENED","RESOLVED",
"VERIFIED","CLOSED"],
- resolution => ["","FIXED","INVALID","WONTFIX","LATER","REMIND",
- "DUPLICATE","WORKSFORME","MOVED"],
+ resolution => ["","FIXED","INVALID","WONTFIX", "DUPLICATE","WORKSFORME",
+ "MOVED"],
};
#####################################################################
diff --git a/contrib/gnats2bz.pl b/contrib/gnats2bz.pl
index 7a509682e..95ae32ad9 100644
--- a/contrib/gnats2bz.pl
+++ b/contrib/gnats2bz.pl
@@ -649,7 +649,7 @@ sub write_bugs {
}
} elsif ($pr_data{"State"} eq "suspended") {
$bug_status = "RESOLVED";
- $resolution = "LATER";
+ $resolution = "WONTFIX";
} else {
$bug_status = "NEW";
$resolution = "";
diff --git a/docs/images/bzLifecycle.xml b/docs/images/bzLifecycle.xml
index d4c33c96c..1adc6b70c 100644
--- a/docs/images/bzLifecycle.xml
+++ b/docs/images/bzLifecycle.xml
@@ -1118,9 +1118,7 @@ possession#</dia:string>
DUPLICATE
WONTFIX
WORKSFORME
- INVALID
- REMIND
- LATER#</dia:string>
+ INVALID#</dia:string>
</dia:attribute>
<dia:attribute name="font">
<dia:font family="sans" style="0" name="Helvetica"/>
diff --git a/template/en/default/global/field-descs.none.tmpl b/template/en/default/global/field-descs.none.tmpl
index f7600dc0d..254bfef1d 100644
--- a/template/en/default/global/field-descs.none.tmpl
+++ b/template/en/default/global/field-descs.none.tmpl
@@ -91,8 +91,6 @@
[% resolution_descs = { "FIXED" => "FIXED",
"INVALID" => "INVALID",
"WONTFIX" => "WONTFIX",
- "LATER" => "LATER",
- "REMIND" => "REMIND",
"DUPLICATE" => "DUPLICATE",
"WORKSFORME" => "WORKSFORME",
"MOVED" => "MOVED",