diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md new file mode 100644 index 0000000000..43f322d4b5 --- /dev/null +++ b/.github/pull_request_template.md @@ -0,0 +1,43 @@ +## Related issue + + + +## Proposed changes + + + +## Checklist + + + +- [ ] I have read the [contributing guidelines](../blob/master/CONTRIBUTING.md). +- [ ] I have read the [security policy](../security/policy). +- [ ] I confirm that this pull request does not address a security + vulnerability. If this pull request addresses a security. vulnerability, I + confirm that I got green light (please contact + [security@ory.sh](mailto:security@ory.sh)) from the maintainers to push + the changes. +- [ ] I have added tests that prove my fix is effective or that my feature + works. +- [ ] I have added or changed [the documentation](docs/docs). + +## Further comments + + diff --git a/.github/workflows/closed_references.yml b/.github/workflows/closed_references.yml new file mode 100644 index 0000000000..17b1c6150d --- /dev/null +++ b/.github/workflows/closed_references.yml @@ -0,0 +1,24 @@ +name: Closed Reference Notifier + +on: + schedule: + - cron: '0 7 * * *' + workflow_dispatch: + inputs: + issueLimit: + description: Max. number of issues to create + required: true + default: '5' + +jobs: + find_closed_references: + runs-on: ubuntu-latest + name: Find closed references + steps: + - uses: actions/checkout@v2 + - uses: ory/closed-reference-notifier@v1.1.4 + with: + token: ${{ secrets.GITHUB_TOKEN }} + ignore: '.git,**/node_modules,docs,CHANGELOG.md,.bin' + issueLabels: upstream + issueLimit: ${{ github.event.inputs.issueLimit || '5' }} diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml index ff29a05344..4ad85dbec6 100644 --- a/.github/workflows/labels.yml +++ b/.github/workflows/labels.yml @@ -1,4 +1,3 @@ - name: Synchronize Issue Labels on: diff --git a/.github/workflows/milestone.yml b/.github/workflows/milestone.yml index 3ae816999b..5b5e7f97a4 100644 --- a/.github/workflows/milestone.yml +++ b/.github/workflows/milestone.yml @@ -3,7 +3,7 @@ name: Generate and Publish Milestone Document on: workflow_dispatch: schedule: - - cron: "0 0 * * *" + - cron: "0 0 * * *" jobs: milestone: diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index 7eeed9efc8..117f8469ba 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -1,24 +1,24 @@ -name: "Close stale issues" +name: "Close Stale Issues" on: workflow_dispatch: schedule: - - cron: "0 0 * * *" + - cron: "0 0 * * *" jobs: stale: runs-on: ubuntu-latest steps: - - uses: actions/stale@v3 - with: - repo-token: ${{ secrets.GITHUB_TOKEN }} - stale-issue-message: | - Thank you for opening this issue. It appears that the request for more information (e.g. providing the software version, providing logs, ...) has not yet been completed. Therefore this issue will be automatically - closed in 7 days, assuming that the issue has been resolved. - stale-pr-message: | - Thank you for opening this pull request. It appears that a request for e.g. information has not yet been completed. Therefore this issue will be automatically - closed in 7 days, assuming that the proposed change is no longer required or has otherwise been resolved. - stale-issue-label: 'stale' - stale-pr-label: 'stale' - only-labels: 'needs more info' - days-before-stale: 7 - days-before-close: 7 + - uses: actions/stale@v3 + with: + repo-token: ${{ secrets.GITHUB_TOKEN }} + stale-issue-message: | + Thank you for opening this issue. It appears that the request for more information (e.g. providing the software version, providing logs, ...) has not yet been completed. Therefore this issue will be automatically + closed in 7 days, assuming that the issue has been resolved. + stale-pr-message: | + Thank you for opening this pull request. It appears that a request for e.g. information has not yet been completed. Therefore this issue will be automatically + closed in 7 days, assuming that the proposed change is no longer required or has otherwise been resolved. + stale-issue-label: 'stale' + stale-pr-label: 'stale' + only-labels: 'needs more info' + days-before-stale: 7 + days-before-close: 7 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 5421475717..bf57ec7848 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -9,7 +9,7 @@ https://github.com/ory/meta/blob/master/templates/repository/CONTRIBUTING.md --> -# Contributing to ORY Oathkeeper +# Contributing to ORY {{Project}} @@ -28,9 +28,9 @@ https://github.com/ory/meta/blob/master/templates/repository/CONTRIBUTING.md ## Introduction -Please note: We take ORY Oathkeeper's security and our users' trust very -seriously. If you believe you have found a security issue in ORY Oathkeeper, -please responsibly disclose by contacting us at hi@ory.sh. +Please note: We take ORY {{Project}}'s security and our users' trust very +seriously. If you believe you have found a security issue in ORY {{Project}}, +please responsibly disclose by contacting us at office@ory.sh. First: if you're unsure or afraid of anything, just ask or submit the issue or pull request anyways. You won't be yelled at for giving it your best effort. The @@ -40,7 +40,7 @@ the way of that. That said, if you want to ensure that a pull request is likely to be merged, talk to us! You can find out our thoughts and ensure that your contribution -won't clash or be obviated by ORY Oathkeeper's normal direction. A great way to +won't clash or be obviated by ORY {{Project}}'s normal direction. A great way to do this is via the [ORY Community](https://community.ory.sh/) or join the [ORY Chat](https://www.ory.sh/chat). @@ -48,7 +48,7 @@ do this is via the [ORY Community](https://community.ory.sh/) or join the Unless you are fixing a known bug, we **strongly** recommend discussing it with the core team via a GitHub issue or [in our chat](https://www.ory.sh/chat) -before getting started to ensure your work is consistent with ORY Oathkeeper's +before getting started to ensure your work is consistent with ORY {{Project}}'s roadmap and architecture. All contributions are made via pull request. Note that **all patches from all @@ -132,7 +132,7 @@ community a safe place for you and we've got your back. - Private harassment is also unacceptable. No matter who you are, if you feel you have been or are being harassed or made uncomfortable by a community member, please contact one of the channel ops or a member of the ORY - Oathkeeper core team immediately. + {{Project}} core team immediately. - Likewise any spamming, trolling, flaming, baiting or other attention-stealing behaviour is not welcome. diff --git a/README.md b/README.md index b3655cebab..b4b809edf1 100644 --- a/README.md +++ b/README.md @@ -88,7 +88,7 @@ been able to achieve this without each and everyone of you! The following list represents companies that have accompanied us along the way and that have made outstanding contributions to our ecosystem. _If you think that your company deserves a spot here, reach out to -hi@ory.sh now_! +office@ory.sh now_! **Please consider giving back by becoming a sponsor of our open source work on Patreon or @@ -204,6 +204,7 @@ TheCrealm. + ## Ecosystem @@ -268,6 +269,7 @@ to perform a certain action on a resource. + ## Security ### Disclosing vulnerabilities diff --git a/docs/docs/contributing.md b/docs/docs/contributing.md new file mode 100644 index 0000000000..61aa011c5f --- /dev/null +++ b/docs/docs/contributing.md @@ -0,0 +1,146 @@ +--- +id: contributing +title: Contribution Guidelines +--- + + + + +# Contributing to ORY {{Project}} + + + + + +- [Introduction](#introduction) +- [Contributing Code](#contributing-code) +- [Disclosing vulnerabilities](#disclosing-vulnerabilities) +- [Code Style](#code-style) +- [Documentation](#documentation) +- [Pull request procedure](#pull-request-procedure) +- [Communication](#communication) +- [Conduct](#conduct) + + + +## Introduction + +Please note: We take ORY {{Project}}'s security and our users' trust very +seriously. If you believe you have found a security issue in ORY {{Project}}, +please responsibly disclose by contacting us at office@ory.sh. + +First: if you're unsure or afraid of anything, just ask or submit the issue or +pull request anyways. You won't be yelled at for giving it your best effort. The +worst that can happen is that you'll be politely asked to change something. We +appreciate any sort of contributions, and don't want a wall of rules to get in +the way of that. + +That said, if you want to ensure that a pull request is likely to be merged, +talk to us! You can find out our thoughts and ensure that your contribution +won't clash or be obviated by ORY {{Project}}'s normal direction. A great way to +do this is via the [ORY Community](https://community.ory.sh/) or join the +[ORY Chat](https://www.ory.sh/chat). + +## Contributing Code + +Unless you are fixing a known bug, we **strongly** recommend discussing it with +the core team via a GitHub issue or [in our chat](https://www.ory.sh/chat) +before getting started to ensure your work is consistent with ORY {{Project}}'s +roadmap and architecture. + +All contributions are made via pull request. Note that **all patches from all +contributors get reviewed**. After a pull request is made other contributors +will offer feedback, and if the patch passes review a maintainer will accept it +with a comment. When pull requests fail testing, authors are expected to update +their pull requests to address the failures until the tests pass and the pull +request merges successfully. + +At least one review from a maintainer is required for all patches (even patches +from maintainers). + +Reviewers should leave a "LGTM" comment once they are satisfied with the patch. +If the patch was submitted by a maintainer with write access, the pull request +should be merged by the submitter after review. + +## Disclosing vulnerabilities + +Please disclose vulnerabilities exclusively to +[security@ory.sh](mailto:security@ory.sh). Do not use GitHub issues. + +## Code Style + +Please follow these guidelines when formatting source code: + +- Go code should match the output of `gofmt -s` and pass `golangci-lint run`. +- NodeJS and JavaScript code should be prettified using `npm run format` where + appropriate. + +## Documentation + +Please provide documentation when changing, removing, or adding features. +Documentation resides in the project's [docs](docs) folder. Generate API and +configuration reference documentation using `cd docs; npm run gen`. + +For further instructions please head over to [docs/README.md](docs/README.md). + +## Pull request procedure + +To make a pull request, you will need a GitHub account; if you are unclear on +this process, see GitHub's documentation on +[forking](https://help.github.com/articles/fork-a-repo) and +[pull requests](https://help.github.com/articles/using-pull-requests). Pull +requests should be targeted at the `master` branch. Before creating a pull +request, go through this checklist: + +1. Create a feature branch off of `master` so that changes do not get mixed up. +1. [Rebase](http://git-scm.com/book/en/Git-Branching-Rebasing) your local + changes against the `master` branch. +1. Run the full project test suite with the `go test ./...` (or equivalent) + command and confirm that it passes. +1. Run `gofmt -s` (if the project is written in Go). +1. Ensure that each commit has a subsystem prefix (ex: `controller:`). + +Pull requests will be treated as "review requests," and maintainers will give +feedback on the style and substance of the patch. + +Normally, all pull requests must include tests that test your change. +Occasionally, a change will be very difficult to test for. In those cases, +please include a note in your commit message explaining why. + +## Communication + +We use [Slack](https://www.ory.sh/chat). You are welcome to drop in and ask +questions, discuss bugs, etc. + +## Conduct + +Whether you are a regular contributor or a newcomer, we care about making this +community a safe place for you and we've got your back. + +- We are committed to providing a friendly, safe and welcoming environment for + all, regardless of gender, sexual orientation, disability, ethnicity, + religion, or similar personal characteristic. +- Please avoid using nicknames that might detract from a friendly, safe and + welcoming environment for all. +- Be kind and courteous. There is no need to be mean or rude. +- We will exclude you from interaction if you insult, demean or harass anyone. + In particular, we do not tolerate behavior that excludes people in socially + marginalized groups. +- Private harassment is also unacceptable. No matter who you are, if you feel + you have been or are being harassed or made uncomfortable by a community + member, please contact one of the channel ops or a member of the ORY + {{Project}} core team immediately. +- Likewise any spamming, trolling, flaming, baiting or other attention-stealing + behaviour is not welcome. + +We welcome discussion about creating a welcoming, safe, and productive +environment for the community. If you have any questions, feedback, or concerns +[please let us know](https://www.ory.sh/chat).