From 0175713ae4fc4e84fabcb5d8bf9f09d0585315f2 Mon Sep 17 00:00:00 2001 From: Dan Jensen <djensen@gitlab.com> Date: Fri, 28 Jan 2022 16:31:09 +0000 Subject: [PATCH] Update references to Accepting merge requests The "Accepting merge requests" label is being re-named to "Seeking merge requests" to improve clarity. This updates all references in the documentation. --- PROCESS.md | 6 ++--- doc/development/contributing/index.md | 2 +- .../contributing/issue_workflow.md | 26 +++++++++++-------- .../contributing/merge_request_workflow.md | 4 +-- 4 files changed, 21 insertions(+), 17 deletions(-) diff --git a/PROCESS.md b/PROCESS.md index 67abe2f0a98ab..2757075e35411 100644 --- a/PROCESS.md +++ b/PROCESS.md @@ -22,7 +22,7 @@ - [Code format](#code-format) - [Issue fixed in newer version](#issue-fixed-in-newer-version) - [Improperly formatted merge request](#improperly-formatted-merge-request) - - [Accepting merge requests](#accepting-merge-requests) + - [Seeking community contributions](#seeking-community-contributions) - [Only accepting merge requests with green tests](#only-accepting-merge-requests-with-green-tests) <!-- END doctoc generated TOC please keep comment here to allow auto update --> @@ -195,14 +195,14 @@ Thanks for your interest in improving the GitLab codebase! Please update your merge request according to the [contributing guidelines](https://gitlab.com/gitlab-org/gitlab/blob/master/doc/development/contributing/merge_request_workflow.md#merge-request-guidelines). ``` -### Accepting merge requests +### Seeking community contributions ``` Is there an issue on the [issue tracker](https://gitlab.com/gitlab-org/gitlab/issues) that is similar to this? Could you please link it here? Please be aware that new functionality that is not marked -[`Accepting merge requests`](https://docs.gitlab.com/ee/development/contributing/issue_workflow.html#label-for-community-contributors) +[`Seeking community contributions`](https://docs.gitlab.com/ee/development/contributing/issue_workflow.html#label-for-community-contributors) might not make it into GitLab. ``` diff --git a/doc/development/contributing/index.md b/doc/development/contributing/index.md index ec05f75c7092d..ea54f36a7e5bf 100644 --- a/doc/development/contributing/index.md +++ b/doc/development/contributing/index.md @@ -91,7 +91,7 @@ Sign up for the mailing list, answer GitLab questions on StackOverflow or respon If you would like to contribute to GitLab: - Issues with the - [`~Accepting merge requests` label](issue_workflow.md#label-for-community-contributors) + [`~Seeking community contributions` label](issue_workflow.md#label-for-community-contributors) are a great place to start. - Optimizing our tests is another great opportunity to contribute. You can use [RSpec profiling statistics](https://gitlab-org.gitlab.io/rspec_profiling_stats/) to identify diff --git a/doc/development/contributing/issue_workflow.md b/doc/development/contributing/issue_workflow.md index 6a7bbb2e30226..ce582ddce53d2 100644 --- a/doc/development/contributing/issue_workflow.md +++ b/doc/development/contributing/issue_workflow.md @@ -282,12 +282,12 @@ Please refer to the issue triage [severity label](https://about.gitlab.com/handb ### Label for community contributors -Issues that are beneficial to our users, 'nice to haves', that we currently do -not have the capacity for or want to give the priority to, are labeled as -~"Accepting merge requests", so the community can make a contribution. +There are many issues that have a clear solution with uncontroversial benefit to GitLab users. +However, GitLab might not have the capacity for all these proposals in the current roadmap. +These issues are labeled ~"Seeking community contributions" because we welcome merge requests to resolve them. Community contributors can submit merge requests for any issue they want, but -the ~"Accepting merge requests" label has a special meaning. It points to +the ~"Seeking community contributions" label has a special meaning. It points to changes that: 1. We already agreed on, @@ -295,20 +295,24 @@ changes that: 1. Are likely to get accepted by a maintainer. We want to avoid a situation when a contributor picks an -~"Accepting merge requests" issue and then their merge request gets closed, +~"Seeking community contributions" issue and then their merge request gets closed, because we realize that it does not fit our vision, or we want to solve it in a different way. -We automatically add the ~"Accepting merge requests" label to issues -that match the [triage policy](https://about.gitlab.com/handbook/engineering/quality/triage-operations/#accepting-merge-requests). +We manually add the ~"Seeking community contributions" label to issues +that fit the criteria described above. +We do not automatically add this label, because it requires human evaluation. We recommend people that have never contributed to any open source project to -look for issues labeled `~"Accepting merge requests"` with a [weight of 1](https://gitlab.com/groups/gitlab-org/-/issues?state=opened&label_name[]=Accepting+merge+requests&assignee_id=None&sort=weight&weight=1) or the `~"good for new contributors"` [label](https://gitlab.com/gitlab-org/gitlab/-/issues?scope=all&state=opened&label_name[]=good%20for%20new%20contributors&assignee_id=None) attached to it. +look for issues labeled `~"Seeking community contributions"` with a +[weight of 1](https://gitlab.com/groups/gitlab-org/-/issues?sort=created_date&state=opened&label_name[]=Seeking+community+contributions&assignee_id=None&weight=1) or the `~"good for new contributors"` +[label](https://gitlab.com/gitlab-org/gitlab/-/issues?scope=all&state=opened&label_name[]=good%20for%20new%20contributors&assignee_id=None) +attached to it. More experienced contributors are very welcome to tackle -[any of them](https://gitlab.com/groups/gitlab-org/-/issues?state=opened&label_name[]=Accepting+merge+requests&assignee_id=None). +[any of them](https://gitlab.com/groups/gitlab-org/-/issues?sort=created_date&state=opened&label_name[]=Seeking+community+contributions&assignee_id=None). For more complex features that have a weight of 2 or more and clear scope, we recommend looking at issues -with the [label `~"Community Challenge"`](https://gitlab.com/gitlab-org/gitlab/-/issues?scope=all&state=opened&label_name[]=Accepting%20merge%20requests&label_name[]=Community%20challenge). +with the [label `~"Community Challenge"`](https://gitlab.com/gitlab-org/gitlab/-/issues?sort=created_date&state=opened&label_name[]=Seeking+community+contributions&label_name[]=Community+challenge). If your MR for the `~"Community Challenge"` issue gets merged, you will also have a chance to win a custom GitLab merchandise. @@ -319,7 +323,7 @@ members to further discuss scope, design, and technical considerations. This wil ensure that your contribution is aligned with the GitLab product and minimize any rework and delay in getting it merged into main. -GitLab team members who apply the ~"Accepting merge requests" label to an issue +GitLab team members who apply the ~"Seeking community contributions" label to an issue should update the issue description with a responsible product manager, inviting any potential community contributor to @-mention per above. diff --git a/doc/development/contributing/merge_request_workflow.md b/doc/development/contributing/merge_request_workflow.md index 103dfb9a4006b..02148f2a71778 100644 --- a/doc/development/contributing/merge_request_workflow.md +++ b/doc/development/contributing/merge_request_workflow.md @@ -9,7 +9,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w We welcome merge requests from everyone, with fixes and improvements to GitLab code, tests, and documentation. The issues that are specifically suitable -for community contributions are listed with the [`Accepting merge requests`](issue_workflow.md#label-for-community-contributors) +for community contributions have the [`Seeking community contributions`](issue_workflow.md#label-for-community-contributors) label, but you are free to contribute to any issue you want. If an issue is marked for the current milestone at any time, even @@ -18,7 +18,7 @@ in order to ensure the work is finished before the release date. If you want to add a new feature that is not labeled, it is best to first create an issue (if there isn't one already) and leave a comment asking for it -to be marked as `Accepting merge requests`. See the [feature proposals](issue_workflow.md#feature-proposals) +to be labeled as `Seeking community contributions`. See the [feature proposals](issue_workflow.md#feature-proposals) section. Merge requests should be submitted to the appropriate project at GitLab.com, for example -- GitLab