Skip to content

Commit

Permalink
Merge pull request #522 from edx/ned/update-committer-docs
Browse files Browse the repository at this point in the history
Light editing of the contributions docs, especially to account for outside committers
  • Loading branch information
nedbat committed Aug 30, 2015
2 parents 37bbce1 + 4e35503 commit f30c007
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 9 deletions.
8 changes: 4 additions & 4 deletions en_us/developers/source/process/core-committer.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
Core Committer
**************

Core committers are responsible for doing code review on pull requests from
contributors, once the pull request has passed through a community manager and
Core committers (or simply, committers) are responsible for reviewing pull requests from
contributors. This happens once the pull request has passed through a community manager and
been prioritized by a product owner. As much as possible, the code review
process should be treated identically to the process of reviewing a pull request
from another core committer: we’re all part of the same community. However,
process for community contributors should be identical to the process of reviewing a pull request
from another committer: we’re all part of the same community. However,
there are a few ways that the process is different:

* The contributor cannot see when conflicts occur in the branch.
Expand Down
7 changes: 2 additions & 5 deletions en_us/developers/source/process/overview.rst
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,6 @@ different jobs and responsibilities:
:doc:`contributor`
Submits pull requests for eventual committing to an Open edX repository.

.. note::
At the moment, developers who work for edX are core committers, and other
developers are contributors. This may change in the future.

If you are a :doc:`contributor <contributor>` submitting a pull request, expect that it will
take a few weeks before it can be merged. The earlier you can start talking
Expand All @@ -137,9 +134,9 @@ pull request of what’s going on. No one likes to feel like they’re being ign
More details are in the :doc:`product owner guidelines <product-owner>`.

If you are a :doc:`core committer <core-committer>`, allocate some time
in every two-week sprint to review pull requests from other contributors.
in your normal work schedule to review pull requests from other contributors.
The community managers will make sure that these pull requests meet a
basic standard for quality before asking you spend time reviewing them.
basic standard for quality before asking you to spend time reviewing them.
More details are in the :doc:`core committer guidelines <core-committer>`.

Feel free to read the other documentation specific to each individual role in the
Expand Down

0 comments on commit f30c007

Please sign in to comment.