From b375b8749791b5ba0447ee9835ed540512158f9a Mon Sep 17 00:00:00 2001 From: Chris Pappas Date: Wed, 6 Dec 2023 14:31:41 -0500 Subject: [PATCH] docs: update docs --- .github/PULL_REQUEST_TEMPLATE.md | 4 ++-- README.rst | 2 +- docs/decisions/0002-master-branch-split.rst | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index ea90b303..3dfe0b46 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -8,8 +8,6 @@ Although we have stopped integrating new contributions, we always appreciate security disclosures and patches sent to [security@edx.org](mailto:security@edx.org) -## Anyone internally merging to this repository is expected to [release and monitor their changes](https://openedx.atlassian.net/wiki/spaces/RS/pages/1835106870/How+to+contribute+to+our+repositories); if you are not able to do this DO NOT MERGE, please coordinate with someone who can to ensure that the changes are released. - ## If you're merging to master (not 2u/main) branch... **Merge checklist:** @@ -33,6 +31,8 @@ Although we have stopped integrating new contributions, we always appreciate sec ## If you're merging to 2u/main branch... +You are expected to `release and monitor your changes `__ (2U-private link); if you are not able to do this DO NOT MERGE, please coordinate with someone who can to ensure that the changes are released. + **Merge checklist:** - [ ] Any new requirements are in the right place (do **not** manually modify the `requirements/*.txt` files) - `base.in` if needed in production diff --git a/README.rst b/README.rst index c15a936c..741a18bc 100644 --- a/README.rst +++ b/README.rst @@ -68,7 +68,7 @@ The code in this repository is licensed under the AGPL unless otherwise noted. P How To Contribute ----------------- -Notice: Internal 2U contributions should be made against the ``2u/main`` branch. Open source contributions should continue to be made against the ``master`` branch. +Notice: Internal 2U changes should be made against the ``2u/main`` branch. Open source contributions should continue to be made against the ``master`` branch. Anyone merging to the ``2u/main`` branch of this repository is expected to `release and monitor their changes `__ (2U-private link); if you are not able to do this DO NOT MERGE, please coordinate with someone who can to ensure that the changes are released. diff --git a/docs/decisions/0002-master-branch-split.rst b/docs/decisions/0002-master-branch-split.rst index 7b819946..6939e861 100644 --- a/docs/decisions/0002-master-branch-split.rst +++ b/docs/decisions/0002-master-branch-split.rst @@ -9,7 +9,7 @@ Accepted Context ------- -Both 2U and the Open edX community use ecommerce-worker's master branch for releases. Occasionally, changes +Both 2U and the Open edX community used ecommerce-worker's master branch for releases. Occasionally, changes specific to 2U's business case are merged into code, which also influences the structure of the code that the community runs, even if the changes are not relevant or beneficial to the community at large.