[qemu-web PATCH] contribute: ask not to submit merge requests

[qemu-web PATCH] contribute: ask not to submit merge requests

[Paolo Bonzini]

Currently, the bug reporting page has a paragraph about not sending patches
on the bug tracker, with a link to the patch submission guidelines.

However, now that the tracker is hosted on Gitlab it is more likely that
prospective contributors will submit a merge request linked to an issue,
rather than attaching a patch to the issue.  Update the language and,
since it is not limited to bug reports, move it to the main contribute
page.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 contribute.md              | 3 ++-
 contribute/report-a-bug.md | 2 --
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/contribute.md b/contribute.md
index cbb476d..4802452 100644
--- a/contribute.md
+++ b/contribute.md
@@ -15,7 +15,8 @@ permalink: /contribute/
 
 * Read developer documentation: &ldquo;[Getting started for developers](https://wiki.qemu.org/Documentation/GettingStartedDevelopers)&rdquo;,
   &ldquo;[Contributor FAQ](https://wiki.qemu.org/Contribute/FAQ)&rdquo;,
-  &ldquo;[How to submit a patch](https://wiki.qemu.org/Contribute/SubmitAPatch)&rdquo;,
   &ldquo;[Improve the website](https://www.qemu.org/2017/02/04/the-new-qemu-website-is-up/)&rdquo;
 
+Please do not submit merge requests on GitLab; patches are sent to the mailing list according to QEMU's [patch submissions guidelines](https://wiki.qemu.org/Contribute/SubmitAPatch).
+
 Contributing to QEMU is subject to the [QEMU Code of Conduct](https://qemu.org/docs/master/devel/code-of-conduct.html).
diff --git a/contribute/report-a-bug.md b/contribute/report-a-bug.md
index 922f699..807daf8 100644
--- a/contribute/report-a-bug.md
+++ b/contribute/report-a-bug.md
@@ -18,8 +18,6 @@ When submitting a bug report, please try to do the following:
 
 * Include information about the host and guest (operating system, version, 32/64-bit).
 
-* Do not contribute patches on the bug tracker; send patches to the mailing list. Follow QEMU's [guidelines about submitting patches](https://wiki.qemu.org/Contribute/SubmitAPatch).
-
 Do NOT report security issues (or other bugs, too) as "private" bugs in the
 bug tracker.  QEMU has a [security process](../security-process) for issues
 that should be reported in a non-public way instead.
-- 
2.31.1

Re: [qemu-web PATCH] contribute: ask not to submit merge requests

[Daniel P. Berrangé]

On Fri, Sep 10, 2021 at 05:29:33PM +0200, Paolo Bonzini wrote:
> Currently, the bug reporting page has a paragraph about not sending patches
> on the bug tracker, with a link to the patch submission guidelines.
> 
> However, now that the tracker is hosted on Gitlab it is more likely that
> prospective contributors will submit a merge request linked to an issue,
> rather than attaching a patch to the issue.  Update the language and,
> since it is not limited to bug reports, move it to the main contribute
> page.
> 
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  contribute.md              | 3 ++-
>  contribute/report-a-bug.md | 2 --
>  2 files changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/contribute.md b/contribute.md
> index cbb476d..4802452 100644
> --- a/contribute.md
> +++ b/contribute.md
> @@ -15,7 +15,8 @@ permalink: /contribute/
>  
>  * Read developer documentation: &ldquo;[Getting started for developers](https://wiki.qemu.org/Documentation/GettingStartedDevelopers)&rdquo;,
>    &ldquo;[Contributor FAQ](https://wiki.qemu.org/Contribute/FAQ)&rdquo;,
> -  &ldquo;[How to submit a patch](https://wiki.qemu.org/Contribute/SubmitAPatch)&rdquo;,
>    &ldquo;[Improve the website](https://www.qemu.org/2017/02/04/the-new-qemu-website-is-up/)&rdquo;
>  
> +Please do not submit merge requests on GitLab; patches are sent to the mailing list according to QEMU's [patch submissions guidelines](https://wiki.qemu.org/Contribute/SubmitAPatch).
> +
>  Contributing to QEMU is subject to the [QEMU Code of Conduct](https://qemu.org/docs/master/devel/code-of-conduct.html).
> diff --git a/contribute/report-a-bug.md b/contribute/report-a-bug.md
> index 922f699..807daf8 100644
> --- a/contribute/report-a-bug.md
> +++ b/contribute/report-a-bug.md
> @@ -18,8 +18,6 @@ When submitting a bug report, please try to do the following:
>  
>  * Include information about the host and guest (operating system, version, 32/64-bit).
>  
> -* Do not contribute patches on the bug tracker; send patches to the mailing list. Follow QEMU's [guidelines about submitting patches](https://wiki.qemu.org/Contribute/SubmitAPatch).
> -

I think it might be worth leaving a warning here despite adding it
to the main contribute index page, as people might land directly on
this page and not see the other page's warning.

>  Do NOT report security issues (or other bugs, too) as "private" bugs in the
>  bug tracker.  QEMU has a [security process](../security-process) for issues
>  that should be reported in a non-public way instead.

Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

Re: [qemu-web PATCH] contribute: ask not to submit merge requests

[Peter Maydell]

On Fri, 10 Sept 2021 at 16:34, Daniel P. Berrangé <berrange@redhat.com> wrote:
> I think it might be worth leaving a warning here despite adding it
> to the main contribute index page, as people might land directly on
> this page and not see the other page's warning.
>
> >  Do NOT report security issues (or other bugs, too) as "private" bugs in the
> >  bug tracker.  QEMU has a [security process](../security-process) for issues
> >  that should be reported in a non-public way instead.

Isn't that text for the old launchpad bug tracker? The gitlab UI equivalent
to launchpad "private" bugs is that there's a tickybox for "This issue is
confidential". (At least accidental confidential gitlab bugs won't have
the same "vanishes into a black hole that nobody looks at" property that
LP private bugs did.)

-- PMM