From dd28c4726194362ff35771a1aa14f02adc012fc8 Mon Sep 17 00:00:00 2001 From: bartvde Date: Tue, 16 Jan 2018 16:46:59 +0100 Subject: [PATCH 1/2] Do not use (I)CLA anymore Use correct spelling for GitHub --- CONTRIBUTING.md | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0b03dbcaab..246d4d05c4 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -31,12 +31,7 @@ This page describes what you need to know to contribute code to OpenLayers as a ## Contributor License Agreement -Before accepting a contribution, we ask that you provide us a Contributor -License Agreement. If you are making your contribution as part of work for -your employer, please follow the guidelines on submitting a [Corporate -Contributor License Agreement](https://raw.github.com/openlayers/cla/master/ccla.txt). If you are -making your contribution as an individual, you can submit a digital [Individual -Contributor License Agreement](https://docs.google.com/spreadsheet/viewform?formkey=dGNNVUJEMXF2dERTU0FXM3JjNVBQblE6MQ). +Your contribution will be under our [license](https://raw.githubusercontent.com/openlayers/openlayers/master/LICENSE.md) as per [GitHub's terms of service](https://help.github.com/articles/github-terms-of-service/#6-contributions-under-repository-license). ## Pull request guidelines From 43e9ae1226c567e0943337f13d7ea3719ebc2f8f Mon Sep 17 00:00:00 2001 From: bartvde Date: Tue, 16 Jan 2018 16:54:19 +0100 Subject: [PATCH 2/2] Remove need for CLA in the PR template --- .github/PULL_REQUEST_TEMPLATE.md | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index f4bee94ff3..1c906528fb 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -6,4 +6,3 @@ In order to get your proposed changes merged into the master branch, we ask you - [ ] It contains one or more small, incremental, logically separate commits, with no merge commits. - [ ] I have used clear commit messages. - [ ] Existing tests pass for me locally & I have added or updated tests for new or changed functionality. -- [ ] The work herein is covered by a valid [Contributor License Agreement (CLA)](https://github.com/openlayers/cla).