aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2018-06-07 13:45:24 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2018-06-07 13:45:24 -0700
commita88c91d3bae08308c20580782ef355b07483add5 (patch)
tree254cfea2ae1b619b0bcb2601bb23f47215f63452
parentMerge tag 'release-5.0.4' into bugstest (diff)
parentHPPA is exp arch now (diff)
downloadgentoo-bugzilla-a88c91d3bae08308c20580782ef355b07483add5.tar.gz
gentoo-bugzilla-a88c91d3bae08308c20580782ef355b07483add5.tar.bz2
gentoo-bugzilla-a88c91d3bae08308c20580782ef355b07483add5.zip
Merge master back to into bugstest for missing changes
-rw-r--r--extensions/Gentoo/template/en/default/hook/bug/create/create-after_cc_field.html.tmpl31
-rw-r--r--extensions/Gentoo/template/en/default/hook/bug/edit-after_cc_field.html.tmpl31
2 files changed, 34 insertions, 28 deletions
diff --git a/extensions/Gentoo/template/en/default/hook/bug/create/create-after_cc_field.html.tmpl b/extensions/Gentoo/template/en/default/hook/bug/create/create-after_cc_field.html.tmpl
index 5ba6ae91f..f335908d8 100644
--- a/extensions/Gentoo/template/en/default/hook/bug/create/create-after_cc_field.html.tmpl
+++ b/extensions/Gentoo/template/en/default/hook/bug/create/create-after_cc_field.html.tmpl
@@ -7,24 +7,27 @@
<option value="alpha@gentoo.org">ALPHA</option>
<option value="amd64@gentoo.org">AMD64</option>
<option value="arm@gentoo.org">ARM</option>
- <option value="hppa@gentoo.org">HPPA</option>
+ <option value="arm64@gentoo.org">ARM64</option>
<option value="ia64@gentoo.org">IA64</option>
- <option value="ppc64@gentoo.org">PPC64</option>
<option value="ppc@gentoo.org">PPC</option>
+ <option value="ppc64@gentoo.org">PPC64</option>
<option value="x86@gentoo.org">X86</option>
- <optgroup label="Unstable arches">
- <option value="arm64@gentoo.org">ARM64</option>
- <option value="bsd@gentoo.org">BSD</option>
- <option value="x86-fbsd@gentoo.org">X86 FBSD</option>
- <option value="amd64-fbsd@gentoo.org">AMD64 FBSD</option>
- <option value="m68k@gentoo.org">M68K</option>
- <option value="mips@gentoo.org">MIPS</option>
- <option value="s390@gentoo.org">S390</option>
- <option value="sh@gentoo.org">SH</option>
- <option value="sparc@gentoo.org">SPARC</option>
+ <optgroup label="exp profiles">
+ <option value="hppa@gentoo.org">HPPA</option>
+ <option value="m68k@gentoo.org">M68K</option>
+ <option value="s390@gentoo.org">S390</option>
+ <option value="sh@gentoo.org">SH</option>
+ <option value="sparc@gentoo.org">SPARC</option>
+ </optgroup>
+ <optgroup label="pure ~arch">
+ <option value="mips@gentoo.org">MIPS</option>
+ <option value="amd64-fbsd@gentoo.org">AMD64 FBSD</option>
+ <option value="x86-fbsd@gentoo.org">X86 FBSD</option>
</optgroup>
- <optgroup label="Other teams">
- <option value="release@gentoo.org">RELEASE</option>
+ <optgroup label="other teams">
+ <option value="bsd@gentoo.org">BSD</option>
+ <option value="prefix@gentoo.org">Prefix</option>
+ <option value="release@gentoo.org">Release</option>
</optgroup>
</select>
</td>
diff --git a/extensions/Gentoo/template/en/default/hook/bug/edit-after_cc_field.html.tmpl b/extensions/Gentoo/template/en/default/hook/bug/edit-after_cc_field.html.tmpl
index bef963c38..4e82810d6 100644
--- a/extensions/Gentoo/template/en/default/hook/bug/edit-after_cc_field.html.tmpl
+++ b/extensions/Gentoo/template/en/default/hook/bug/edit-after_cc_field.html.tmpl
@@ -5,24 +5,27 @@
<option value="alpha@gentoo.org">ALPHA</option>
<option value="amd64@gentoo.org">AMD64</option>
<option value="arm@gentoo.org">ARM</option>
- <option value="hppa@gentoo.org">HPPA</option>
+ <option value="arm64@gentoo.org">ARM64</option>
<option value="ia64@gentoo.org">IA64</option>
- <option value="ppc64@gentoo.org">PPC64</option>
<option value="ppc@gentoo.org">PPC</option>
+ <option value="ppc64@gentoo.org">PPC64</option>
<option value="x86@gentoo.org">X86</option>
- <optgroup label="Unstable arches">
- <option value="arm64@gentoo.org">ARM64</option>
- <option value="bsd@gentoo.org">BSD</option>
- <option value="x86-fbsd@gentoo.org">X86 FBSD</option>
- <option value="amd64-fbsd@gentoo.org">AMD64 FBSD</option>
- <option value="m68k@gentoo.org">M68K</option>
- <option value="mips@gentoo.org">MIPS</option>
- <option value="s390@gentoo.org">S390</option>
- <option value="sh@gentoo.org">SH</option>
- <option value="sparc@gentoo.org">SPARC</option>
+ <optgroup label="exp profiles">
+ <option value="hppa@gentoo.org">HPPA</option>
+ <option value="m68k@gentoo.org">M68K</option>
+ <option value="s390@gentoo.org">S390</option>
+ <option value="sh@gentoo.org">SH</option>
+ <option value="sparc@gentoo.org">SPARC</option>
+ </optgroup>
+ <optgroup label="pure ~arch">
+ <option value="mips@gentoo.org">MIPS</option>
+ <option value="amd64-fbsd@gentoo.org">AMD64 FBSD</option>
+ <option value="x86-fbsd@gentoo.org">X86 FBSD</option>
</optgroup>
- <optgroup label="Other teams">
- <option value="release@gentoo.org">RELEASE</option>
+ <optgroup label="other teams">
+ <option value="bsd@gentoo.org">BSD</option>
+ <option value="prefix@gentoo.org">Prefix</option>
+ <option value="release@gentoo.org">Release</option>
</optgroup>
</select>
</div>