diff --git a/.github/Contributor Agreements v1.0.txt b/.github/Contributor Agreements v1.0.txt index 1a655dbc5..8a6ab0a8b 100644 --- a/.github/Contributor Agreements v1.0.txt +++ b/.github/Contributor Agreements v1.0.txt @@ -9,10 +9,11 @@ and owned by Robert Stoll (the “Project Owner”, hereafter "We" or "Us"). This contributor agreement ("Agreement") documents the rights granted by contributors to -Us. To make this document effective, please sign it and send it to Us by mail, email, fax, or -electronic submission, following the instructions published on the Joinup site. This is a -legally binding document, so please read it carefully before agreeing to it. The Agreement -may cover more than one project managed by Us. +Us. To make this document effective, please sign it. The consent in the form of a sign-off +remark in your pull request is considered as your valid signature. Alternatively you can +sign it and send it to Us by email. +This is a legally binding document, so please read it carefully before agreeing to it. +The Agreement may cover more than one project managed by Us. 1. Definitions "You" (Individual) means the individual who Submits a Contribution to Us. diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 3e6f7f1ae..dc391868f 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,11 +1,3 @@ ---- -Please make sure you can check every item on the following list before you create a pull request: -- [ ] your pull request is rebased on the [latest commit on master](https://github.com/robstoll/atrium/commits/master) -- [ ] your pull request should ideally consists of one small commit. If not then make sure: - - [ ] it cannot be split up in several pull requests. - - [ ] your commits are meaningful to others - e.g. do not include temporary commits like `before lunch`; - [Squash commits](https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History#_squashing) where appropriate. - ---- I confirm that I have read the [Contributor Agreements v1.0](https://github.com/robstoll/atrium/blob/master/.github/Contributor%20Agreements%20v1.0.txt), agree to be bound on them and confirm that my contribution is compliant.