From 5e9c43543efacb240084b032d5148ff8e10cd158 Mon Sep 17 00:00:00 2001 From: Manuel Grizonnet <manuel.grizonnet@cnes.fr> Date: Fri, 6 Apr 2018 16:57:46 +0200 Subject: [PATCH] ENH: Mention ICLA and CCLA in CONTRIBUTING.md and add check box about the cla in the gitlab MR template --- .../request_for_changes.md | 8 ++++++-- CONTRIBUTING.md | 16 ++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/.gitlab/merge_request_templates/request_for_changes.md b/.gitlab/merge_request_templates/request_for_changes.md index 354996678a..1683fac2c3 100644 --- a/.gitlab/merge_request_templates/request_for_changes.md +++ b/.gitlab/merge_request_templates/request_for_changes.md @@ -22,8 +22,12 @@ Describe the testing strategy for new features. ### Documentation -List or link documentation modifications that were made (doxygen, example, software guide, application documentation, cookbook). +List or link documentation modifications that were made (doxygen, example, Software Guide, application documentation, CookBook). ### Additional notes -List remaining open issues if any, and additional notes. +List remaining open issues if any, and additional notes. + +### Copyright + +[ ] I've signed the ORFEO ToolBox Contributor License Agreement diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0df03904ec..c41028ef8a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -117,6 +117,22 @@ Once the feature branch is registered for testing, it should appear in the *Feat Do not forget to remove the feature branch for testing once it has been merged. +### Contribution license agreement + +OTB requires that contributors sign out a [Contributor License +Agreement](https://en.wikipedia.org/wiki/Contributor_License_Agreement). The +purpose of this CLA is to ensure that the project has the necessary ownership or +grants of rights over all contributions to allow them to distribute under the +chosen license (Apache License Version 2.0) + +To accept your contribution, you need to complete, sign and email to *cla [at] +orfeo-toolbox [dot] org* an [Individual Contributor Licensing +Agreement](https://www.orfeo-toolbox.org/cla/icla-en.doc) (ICLA) form and a +[Corporate Contributor Licensing +Agreement](https://www.orfeo-toolbox.org/cla/ccla-en.doc) (CCLA) form if you are +contributing on behalf of your company or another entity which retains copyright +for your contribution. + ## Remote modules [Remote Modules](https://wiki.orfeo-toolbox.org/index.php/Remote_Modules) are -- GitLab