From ef7adb1a9a00bb4afc4e6004b04991696e0edb4b Mon Sep 17 00:00:00 2001 From: Cat Jones <31020910+catherinejones@users.noreply.github.com> Date: Wed, 21 Aug 2019 08:28:28 -0400 Subject: [PATCH] add CLA link to Contributing (#222) * add CLA link to Contributing * adds CLA link to PR template * adds note about re-running CLA check * updates welcome to include links --- .github/PULL_REQUEST_TEMPLATE.md | 1 + .github/welcome.yml | 2 +- README.md | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 8897206f..3135ccd8 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -30,3 +30,4 @@ Fixes # (issue) - [ ] I have added tests that prove my fix is effective or that my feature works - [ ] New and existing unit tests pass locally with my changes - [ ] The test coverage did not decrease +- [ ] I have signed the appropriate [Contributor License Agreement](https://cla.shopify.com/) diff --git a/.github/welcome.yml b/.github/welcome.yml index 4f4cf8f6..6b236178 100644 --- a/.github/welcome.yml +++ b/.github/welcome.yml @@ -2,7 +2,7 @@ newIssueWelcomeComment: > Thanks for opening your first issue here! Be sure to follow the issue template! newPRWelcomeComment: > - Thanks for opening this pull request! Please check out our contributing guidelines and sign the CLA. + Thanks for opening this pull request! Please check out our [contributing guidelines](https://github.com/Shopify/kubeaudit#contribute) and [sign the CLA](https://cla.shopify.com/). firstPRMergeComment: > Congrats on merging your first pull request, keep em coming! diff --git a/README.md b/README.md index dbbb877b..a19447f1 100644 --- a/README.md +++ b/README.md @@ -718,6 +718,9 @@ If you'd like to fix a bug, contribute a feature or just correct a typo, please 1. Run the tests to see everything is working as expected: `make test` 1. Commit your changes: `git commit -am 'Adds awesome feature'` 1. Push to the branch: `git push fork` +1. Sign the [Contributor License Agreement](https://cla.shopify.com/) 1. Submit a PR (All PR must be labeled with :bug: (Bug fix), :sparkles: (New feature), :book: (Documentation update), or :warning: (Breaking changes) ) 1. ??? 1. Profit + +Note that if you didn't sign the CLA before opening your PR, you can re-run the check by adding a comment to the PR that says "I've signed the CLA!"!