summaryrefslogtreecommitdiff
path: root/docs/internals/contributing/committing-code.txt
diff options
context:
space:
mode:
authorErik Romijn <eromijn@solidlinks.nl>2014-11-16 13:32:40 +0100
committerErik Romijn <eromijn@solidlinks.nl>2014-11-16 13:32:40 +0100
commitde912495ab1c3b3e05e79068861ab6b3b5f5c32e (patch)
tree6d5e744d5be99f0ba36db24d7d396920ad23548c /docs/internals/contributing/committing-code.txt
parentf61256da3a266c75c2f75c35172832bf2d605939 (diff)
Added reminder to committing docs to test a PR with Jenkins first.
Diffstat (limited to 'docs/internals/contributing/committing-code.txt')
-rw-r--r--docs/internals/contributing/committing-code.txt8
1 files changed, 8 insertions, 0 deletions
diff --git a/docs/internals/contributing/committing-code.txt b/docs/internals/contributing/committing-code.txt
index 6f7d4fd33b..b96b0c8c18 100644
--- a/docs/internals/contributing/committing-code.txt
+++ b/docs/internals/contributing/committing-code.txt
@@ -21,6 +21,14 @@ best pull requests possible. In practice however, committers - who will likely
be more familiar with the commit guidelines - may decide to bring a commit up
to standard themselves.
+.. note::
+
+ Before merging, but after reviewing, have Jenkins test the pull request by
+ commenting "buildbot, test this please" on the PR.
+ See our `Jenkins wiki page`_ for more details.
+
+.. _Jenkins wiki page: https://code.djangoproject.com/wiki/Jenkins
+
Here is one way to commit a pull request::
# Create a new branch tracking upstream/master -- upstream is assumed