Skip to content
This repository has been archived by the owner on Nov 4, 2024. It is now read-only.

Commit

Permalink
docs: update docs
Browse files Browse the repository at this point in the history
  • Loading branch information
christopappas committed Dec 6, 2023
1 parent 9742c98 commit b375b87
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@

Although we have stopped integrating new contributions, we always appreciate security disclosures and patches sent to [[email protected]](mailto:[email protected])

## 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:**
Expand All @@ -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 <https://2u-internal.atlassian.net/wiki/spaces/RS/pages/7963261/How+to+contribute+to+our+repositories>`__ (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
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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 <https://2u-internal.atlassian.net/wiki/spaces/RS/pages/7963261/How+to+contribute+to+our+repositories>`__ (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.

Expand Down
2 changes: 1 addition & 1 deletion docs/decisions/0002-master-branch-split.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit b375b87

Please sign in to comment.