diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 0c477fd3c0..276ff5c5b9 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -1,5 +1,8 @@ # Contributing +## Contributor Agreement +A pull-request will only be considered for merging into the upstream codebase after you have signed our [contributor agreement](https://github.com/snyk/snyk/blob/master/Contributor-Agreement.md), assigning us the rights to the contributed code and granting you a license to use it in return. If you submit a pull request, you will be prompted to review and sign the agreement with one click (we use [CLA assistant](https://cla-assistant.io/)). + ## Commit messages Commit messages must follow the [Angular-style](https://github.com/angular/angular.js/blob/master/CONTRIBUTING.md#commit-message-format) commit format (but excluding the scope). diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 1fbe94f592..812d07ff46 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,5 +1,5 @@ - [ ] Ready for review -- [ ] Follows CONTRIBUTING rules +- [ ] Follows [CONTRIBUTING](https://github.com/snyk/snyk/blob/master/.github/CONTRIBUTING.md) rules - [ ] Reviewed by Snyk internal team #### What does this PR do? diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md deleted file mode 100644 index 68d323bcad..0000000000 --- a/CONTRIBUTING.md +++ /dev/null @@ -1,4 +0,0 @@ -# Guidelines - -## Contributor Agreement -A pull-request will only be considered for merging into the upstream codebase after you have signed our [contributor agreement](https://github.com/Snyk/snyk/blob/master/Contributor%20Agreement.md), assigning us the rights to the contributed code and granting you a license to use it in return. If you submit a pull request, you will be prompted to review and sign the agreement with one click (we use [CLA assistant](https://cla-assistant.io/)). diff --git a/Contributor Agreement.md b/Contributor-Agreement.md similarity index 100% rename from Contributor Agreement.md rename to Contributor-Agreement.md