From 7e00fee3bd3b780667f072325bdb69f29144c553 Mon Sep 17 00:00:00 2001 From: Maryam Yusuf Date: Sat, 27 Jul 2024 10:48:34 +0200 Subject: [PATCH] Fixed #35546 -- Emphasised accepted ticket requirement in contributing docs. --- .../contributing/bugs-and-features.txt | 5 ----- .../writing-code/submitting-patches.txt | 20 +++++++++++++------ 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/docs/internals/contributing/bugs-and-features.txt b/docs/internals/contributing/bugs-and-features.txt index 52cde58531..c59f79e6b8 100644 --- a/docs/internals/contributing/bugs-and-features.txt +++ b/docs/internals/contributing/bugs-and-features.txt @@ -110,11 +110,6 @@ part of that. Here are some tips on how to make a request most effectively: If there's a consensus agreement on the feature, then it's appropriate to create a ticket. Include a link to the discussion in the ticket description. -As with most open-source projects, code talks. If you are willing to write the -code for the feature yourself or, even better, if you've already written it, -it's much more likely to be accepted. Fork Django on GitHub, create a feature -branch, and show us your work! - See also: :ref:`documenting-new-features`. Requesting performance optimizations diff --git a/docs/internals/contributing/writing-code/submitting-patches.txt b/docs/internals/contributing/writing-code/submitting-patches.txt index 5f930dc16d..6a5c68f573 100644 --- a/docs/internals/contributing/writing-code/submitting-patches.txt +++ b/docs/internals/contributing/writing-code/submitting-patches.txt @@ -6,6 +6,8 @@ We're always grateful for contributions to Django's code. Indeed, bug reports with associated contributions will get fixed *far* more quickly than those without a solution. +.. _trivial-change: + Typo fixes and trivial documentation changes ============================================ @@ -52,9 +54,10 @@ and time availability), claim it by following these steps: .. note:: The Django software foundation requests that anyone contributing more than - a trivial change to Django sign and submit a `Contributor License - Agreement`_, this ensures that the Django Software Foundation has clear - license to all contributions allowing for a clear license for all users. + a :ref:`trivial change `, to Django sign and submit a + `Contributor License Agreement`_, this ensures that the Django Software + Foundation has clear license to all contributions allowing for a clear + license for all users. .. _Login using your GitHub account: https://code.djangoproject.com/github/login .. _Create an account: https://www.djangoproject.com/accounts/register/ @@ -280,9 +283,12 @@ benchmarks can be run on a pull request by labeling the pull request with Contribution checklist ====================== -Use this checklist to review a pull request. If you are reviewing a pull -request that is not your own and it passes all the criteria below, please set -the "Triage Stage" on the corresponding Trac ticket to "Ready for checkin". +Use this checklist to review a pull request. If this contribution would not be +:ref:`considered trivial `, first ensure it has an accepted +ticket before proceeding with the review. + +If the pull request passes all the criteria below and is not your own, please +set the "Triage Stage" on the corresponding Trac ticket to "Ready for checkin". If you've left comments for improvement on the pull request, please tick the appropriate flags on the Trac ticket based on the results of your review: "Patch needs improvement", "Needs documentation", and/or "Needs tests". As time @@ -352,5 +358,7 @@ All tickets :ref:`commit message format `? * Are you the patch author and a new contributor? Please add yourself to the :source:`AUTHORS` file and submit a `Contributor License Agreement`_. +* Does this have an accepted ticket on Trac? All contributions require a ticket + unless the :ref:`change is considered trivial `. .. _Contributor License Agreement: https://www.djangoproject.com/foundation/cla/