From c05e623d97b2f5b13b6c1a6fcb1279edcf7aea3e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 11 Nov 2015 19:18:19 +0100 Subject: [PATCH] Update rules to have a better conrol on external libraries and dependencies addition --- CONTRIBUTING.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 304924fe150..8640c5e9b2f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -38,7 +38,7 @@ We officially support versions N, N − 1 and N − 2 for N the latest version a Choose your base branch accordingly. ### General rules -Please don't edit the ChangeLog file. A project manager will update it from your commit messages. +Please don't edit the ChangeLog file. File will be generated from your commit messages during release process by the project manager. ### Commits Use clear commit messages with the following structure: @@ -50,7 +50,7 @@ LONGDESC ``` #### Keyword -In uppercase to appear in ChangeLog when generated. +In uppercase if you want to have the log comment appears into the generated ChangeLog file. The keyword can be ommitted if your commit does not fit in any of the following categories: - Fix: for a bug fix @@ -97,6 +97,10 @@ When submitting a pull request, use same rule as [Commits](#commits) for the mes If your pull request only contains one commit, GitHub will be smart enough to fill it for you. Otherwise, please be a bit verbose about what you're providing. +You Pull Request must pass the Continuous Integration checks. +Also, if you want to include a new external library (into htdocs/includes directory), please ask before to the project +leader to see if such a library can be accepted. + ### Resources [Developer documentation](http://wiki.dolibarr.org/index.php/Developer_documentation)