p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added a note regarding interaction between GitHub and Trac Plugin

This commit is contained in:
Preston Holmes 2012-09-27 13:19:04 -07:00
parent 373932fa6b
commit 1df58968a4
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docs/internals/contributing/committing-code.txt
View File

@ -187,7 +187,15 @@ Django's Git repository:
For the curious, we're using a `Trac plugin`_ for this. For the curious, we're using a `Trac plugin`_ for this.
.. _Trac plugin: https://github.com/aaugustin/trac-github .. note::
Note that the Trac integration doesn't know anything about pull requests.
So if you try to close a pull request with the phrase "closes #400" in your
commit message, GitHub will close the pull request, but the Trac plugin
will also close the same numbered ticket in Trac.
.. _Trac plugin: https://github.com/aaugustin/trac-github
* If your commit references a ticket in the Django `ticket tracker`_ but * If your commit references a ticket in the Django `ticket tracker`_ but
does *not* close the ticket, include the phrase "Refs #xxxxx", where "xxxxx" does *not* close the ticket, include the phrase "Refs #xxxxx", where "xxxxx"