diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2020-01-29 06:39:10 -0800 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2020-01-29 06:39:43 -0800 |
commit | 8a223623572cb66ba5d1bcd6621dad64095f5483 (patch) | |
tree | 7508fc6103ec6989fe23a9ced7f174b8dcd70047 | |
parent | Try reenabling SecureMail (diff) | |
parent | Gentoo: alpha is now ~arch-only (diff) | |
download | bugzilla-8a223623572cb66ba5d1bcd6621dad64095f5483.tar.gz bugzilla-8a223623572cb66ba5d1bcd6621dad64095f5483.tar.bz2 bugzilla-8a223623572cb66ba5d1bcd6621dad64095f5483.zip |
Merge remote-tracking branch 'origin/master' into bugstest
Master gained some changes that didn't stage in bugstest first.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
3 files changed, 4 insertions, 3 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 eb625e6bf..9f8fd43f7 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 @@ -4,7 +4,6 @@ </td> <td> <select name="addarches" multiple size="5" class="arch-selector"> - <option value="alpha@gentoo.org">ALPHA</option> <option value="amd64@gentoo.org">AMD64</option> <option value="arm@gentoo.org">ARM</option> <option value="arm64@gentoo.org">ARM64</option> @@ -20,8 +19,9 @@ <option value="sparc@gentoo.org">SPARC</option> </optgroup> <optgroup label="pure ~arch"> + <option value="alpha@gentoo.org">ALPHA</option> <option value="mips@gentoo.org">MIPS</option> - <option value="riscv@gentoo">RISC-V</option> + <option value="riscv@gentoo">RISC-V</option> </optgroup> <optgroup label="other teams"> <option value="prefix@gentoo.org">Prefix</option> 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 71253cab4..6537e23f6 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 @@ -2,7 +2,6 @@ <div> <button onclick="add_arches_edit()" type="button">Add arches:</button> <select name="addarches" multiple size="5" class="arch-selector"> - <option value="alpha@gentoo.org">ALPHA</option> <option value="amd64@gentoo.org">AMD64</option> <option value="arm@gentoo.org">ARM</option> <option value="arm64@gentoo.org">ARM64</option> @@ -18,6 +17,7 @@ <option value="sparc@gentoo.org">SPARC</option> </optgroup> <optgroup label="pure ~arch"> + <option value="alpha@gentoo.org">ALPHA</option> <option value="mips@gentoo.org">MIPS</option> <option value="riscv@gentoo.org">RISC-V</option> </optgroup> diff --git a/template/en/default/attachment/createformcontents.html.tmpl b/template/en/default/attachment/createformcontents.html.tmpl index a12dee82d..e38ab27a9 100644 --- a/template/en/default/attachment/createformcontents.html.tmpl +++ b/template/en/default/attachment/createformcontents.html.tmpl @@ -11,6 +11,7 @@ <tr> <td class="comment" colspan="2"> <ol> + <li>Make sure that your user has permissions to read the file you are trying to attach. If you don't, you will most likel get a confusing error message.</li> <li>Please attach build logs and other informational files as <em>plain text</em>. If build log is larger than [% max_limit FILTER html %] KB, please compress it using compression tool such as bzip2 or xz (<em>without</em> tar).</li> <li>Patches, ebuilds and other copyrightable files meant for integration must conform to the Gentoo <a rel='external' href='https://www.gentoo.org/glep/glep-0076.html'>copyright policy</a>. Such conformance must be explicitly acknowledged through <a rel='external' href='https://www.gentoo.org/glep/glep-0076.html#certificate-of-origin'>GCO</a> sign-off, confirmed with <em>your real name</em>.</li> <li>Please attach ebuild updates and new packages preferably as git-format patches with explanatory commit messages (see: <a rel='external' href='https://www.gentoo.org/glep/glep-0066.html'>GLEP 66</a>) and a GCO sign-off. Alternatively, please include the sign-off in a comment when attaching non-patch format files.</li> |