From 1cede29986a5f26a5a5ac0787dbcaa2003bda624 Mon Sep 17 00:00:00 2001 From: Raphael Flores <raphael.flores@inra.fr> Date: Mon, 19 Nov 2018 15:50:59 +0100 Subject: [PATCH] Update CONTRIBUTING.md --- CONTRIBUTING.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8d74598d..a8af2788 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -4,13 +4,14 @@ ### Branches -* One stable & protected master branch +* One stable & protected [master](/) branch * Feature branches for development following the pattern `[dev_type]/[dev_name]` (ie. `chore/explaining_how_to_merge`) where `[dev_type]` can be: * fix (bug fixes) * feat (new feature) * style (style modification) * refactor (code refactoring) * chore (base maintenance such as version bump) + * test (for anything related to tests) ### Commit & branches merge * Commit name should follow pattern `[dev_type]: [brief description of the commit, lower than 50 characters]. [JIRA-KEY]` @@ -40,7 +41,7 @@ * Continuous Integration is launched automatically by Gitlab on each commit push or merge request creation. ## Data management -* Git LFS feature is enabled on this project in order to store JSON test data +* Git LFS (look at [how to install](https://git-lfs.github.com/)) feature is enabled on this project in order to store JSON test data * Another dedicated Git LFS project (internal only) will be created to handle all private + public JSON files * **TODO**: refer to the good Git LFS project in the CI settings for indexing the relevant data into the relevant Elasticsearch indices/instances * the JSON files generation will be handled by an external ET (extract/transform) tool. -- GitLab