|
2 | 2 |
|
3 | 3 | <!-- START doctoc generated TOC please keep comment here to allow auto update -->
|
4 | 4 | <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
|
| 5 | + |
5 | 6 | **Table of Contents**
|
6 | 7 |
|
7 | 8 | - [Introduction](#introduction)
|
|
16 | 17 |
|
17 | 18 | ## Introduction
|
18 | 19 |
|
19 |
| -Please note: We take ORY Oathkeeper's security and our users' trust very seriously. If you believe you have found a |
20 |
| -security issue in ORY Oathkeeper, please responsibly disclose by contacting us at hi@ory.sh. |
| 20 | +Please note: We take ORY Oathkeeper's security and our users' trust very |
| 21 | +seriously. If you believe you have found a security issue in ORY Oathkeeper, |
| 22 | +please responsibly disclose by contacting us at hi@ory.sh. |
21 | 23 |
|
22 |
| -First: if you're unsure or afraid of anything, just ask or submit the issue or pull request anyways. You won't be |
23 |
| -yelled at for giving it your best effort. The worst that can happen is that you'll be politely asked to change |
24 |
| -something. We appreciate any sort of contributions, and don't want a wall of rules to get in the way of that. |
| 24 | +First: if you're unsure or afraid of anything, just ask or submit the issue or |
| 25 | +pull request anyways. You won't be yelled at for giving it your best effort. The |
| 26 | +worst that can happen is that you'll be politely asked to change something. We |
| 27 | +appreciate any sort of contributions, and don't want a wall of rules to get in |
| 28 | +the way of that. |
25 | 29 |
|
26 |
| -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 |
27 |
| -and ensure that your contribution won't clash or be obviated by ORY Oathkeeper's normal direction. A great way to do this is via |
28 |
| -the [ORY Community](https://community.ory.sh/) or join the [ORY Chat](https://www.ory.sh/chat). |
| 30 | +That said, if you want to ensure that a pull request is likely to be merged, |
| 31 | +talk to us! You can find out our thoughts and ensure that your contribution |
| 32 | +won't clash or be obviated by ORY Oathkeeper's normal direction. A great way to |
| 33 | +do this is via the [ORY Community](https://community.ory.sh/) or join the |
| 34 | +[ORY Chat](https://www.ory.sh/chat). |
29 | 35 |
|
30 | 36 | ## Contributing Code
|
31 | 37 |
|
32 |
| -Unless you are fixing a known bug, we **strongly** recommend discussing it with the core team via a GitHub issue or |
33 |
| -[in our chat](https://www.ory.sh/chat) before getting started to ensure your work is consistent with |
34 |
| -ORY Oathkeeper's roadmap and architecture. |
| 38 | +Unless you are fixing a known bug, we **strongly** recommend discussing it with |
| 39 | +the core team via a GitHub issue or [in our chat](https://www.ory.sh/chat) |
| 40 | +before getting started to ensure your work is consistent with ORY Oathkeeper's |
| 41 | +roadmap and architecture. |
35 | 42 |
|
36 |
| -All contributions are made via pull request. Note that **all patches from all contributors get reviewed**. After a pull |
37 |
| -request is made other contributors will offer feedback, and if the patch passes review a maintainer will accept it with |
38 |
| -a comment. When pull requests fail testing, authors are expected to update their pull requests to address the failures |
39 |
| -until the tests pass and the pull request merges successfully. |
| 43 | +All contributions are made via pull request. Note that **all patches from all |
| 44 | +contributors get reviewed**. After a pull request is made other contributors |
| 45 | +will offer feedback, and if the patch passes review a maintainer will accept it |
| 46 | +with a comment. When pull requests fail testing, authors are expected to update |
| 47 | +their pull requests to address the failures until the tests pass and the pull |
| 48 | +request merges successfully. |
40 | 49 |
|
41 |
| -At least one review from a maintainer is required for all patches (even patches from maintainers). |
| 50 | +At least one review from a maintainer is required for all patches (even patches |
| 51 | +from maintainers). |
42 | 52 |
|
43 |
| -Reviewers should leave a "LGTM" comment once they are satisfied with the patch. If the patch was submitted by a |
44 |
| -maintainer with write access, the pull request should be merged by the submitter after review. |
| 53 | +Reviewers should leave a "LGTM" comment once they are satisfied with the patch. |
| 54 | +If the patch was submitted by a maintainer with write access, the pull request |
| 55 | +should be merged by the submitter after review. |
45 | 56 |
|
46 | 57 | ## Disclosing vulnerabilities
|
47 | 58 |
|
48 |
| -Please disclose vulnerabilities exclusively to [hi@ory.am](mailto:hi@ory.am). Do not use GitHub issues. |
| 59 | +Please disclose vulnerabilities exclusively to [hi@ory.am](mailto:hi@ory.am). Do |
| 60 | +not use GitHub issues. |
49 | 61 |
|
50 | 62 | ## Code Style
|
51 | 63 |
|
52 | 64 | Please follow these guidelines when formatting source code:
|
53 | 65 |
|
54 |
| -* Go code should match the output of `gofmt -s` |
| 66 | +- Go code should match the output of `gofmt -s` |
55 | 67 |
|
56 | 68 | ## Pull request procedure
|
57 | 69 |
|
58 |
| -To make a pull request, you will need a GitHub account; if you are unclear on this process, see GitHub's |
59 |
| -documentation on [forking](https://help.github.com/articles/fork-a-repo) and [pull requests](https://help.github.com/articles/using-pull-requests). |
60 |
| -Pull requests should be targeted at the `master` branch. Before creating a pull request, go through this checklist: |
| 70 | +To make a pull request, you will need a GitHub account; if you are unclear on |
| 71 | +this process, see GitHub's documentation on |
| 72 | +[forking](https://help.github.com/articles/fork-a-repo) and |
| 73 | +[pull requests](https://help.github.com/articles/using-pull-requests). Pull |
| 74 | +requests should be targeted at the `master` branch. Before creating a pull |
| 75 | +request, go through this checklist: |
61 | 76 |
|
62 | 77 | 1. Create a feature branch off of `master` so that changes do not get mixed up.
|
63 |
| -1. [Rebase](http://git-scm.com/book/en/Git-Branching-Rebasing) your local changes against the `master` branch. |
64 |
| -1. Run the full project test suite with the `go test ./...` (or equivalent) command and confirm that it passes. |
| 78 | +1. [Rebase](http://git-scm.com/book/en/Git-Branching-Rebasing) your local |
| 79 | + changes against the `master` branch. |
| 80 | +1. Run the full project test suite with the `go test ./...` (or equivalent) |
| 81 | + command and confirm that it passes. |
65 | 82 | 1. Run `gofmt -s` (if the project is written in Go).
|
66 |
| -1. Ensure that each commit has a subsystem prefix (ex: `controller: `). |
| 83 | +1. Ensure that each commit has a subsystem prefix (ex: `controller:`). |
67 | 84 |
|
68 |
| -Pull requests will be treated as "review requests," and maintainers will give feedback on the style and substance of the patch. |
| 85 | +Pull requests will be treated as "review requests," and maintainers will give |
| 86 | +feedback on the style and substance of the patch. |
69 | 87 |
|
70 |
| -Normally, all pull requests must include tests that test your change. Occasionally, a change will |
71 |
| -be very difficult to test for. In those cases, please include a note in your commit message explaining why. |
| 88 | +Normally, all pull requests must include tests that test your change. |
| 89 | +Occasionally, a change will be very difficult to test for. In those cases, |
| 90 | +please include a note in your commit message explaining why. |
72 | 91 |
|
73 | 92 | ## Communication
|
74 | 93 |
|
75 |
| -We use [discord](https://www.ory.sh/chat). You are welcome to drop in and ask questions, discuss bugs, etc. |
| 94 | +We use [discord](https://www.ory.sh/chat). You are welcome to drop in and ask |
| 95 | +questions, discuss bugs, etc. |
76 | 96 |
|
77 | 97 | ## Conduct
|
78 | 98 |
|
79 |
| -Whether you are a regular contributor or a newcomer, we care about making this community a safe place for you and |
80 |
| -we've got your back. |
81 |
| - |
82 |
| -* We are committed to providing a friendly, safe and welcoming environment for all, regardless of gender, |
83 |
| - sexual orientation, disability, ethnicity, religion, or similar personal characteristic. |
84 |
| -* Please avoid using nicknames that might detract from a friendly, safe and welcoming environment for all. |
85 |
| -* Be kind and courteous. There is no need to be mean or rude. |
86 |
| -* We will exclude you from interaction if you insult, demean or harass anyone. In particular, we do not tolerate |
87 |
| - behavior that excludes people in socially marginalized groups. |
88 |
| -* Private harassment is also unacceptable. No matter who you are, if you feel you have been or are being harassed or |
89 |
| - made uncomfortable by a community member, please contact one of the channel ops or a member of the ORY |
90 |
| - Oathkeeper core team immediately. |
91 |
| -* Likewise any spamming, trolling, flaming, baiting or other attention-stealing behaviour is not welcome. |
92 |
| - |
93 |
| -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). |
| 99 | +Whether you are a regular contributor or a newcomer, we care about making this |
| 100 | +community a safe place for you and we've got your back. |
| 101 | + |
| 102 | +- We are committed to providing a friendly, safe and welcoming environment for |
| 103 | + all, regardless of gender, sexual orientation, disability, ethnicity, |
| 104 | + religion, or similar personal characteristic. |
| 105 | +- Please avoid using nicknames that might detract from a friendly, safe and |
| 106 | + welcoming environment for all. |
| 107 | +- Be kind and courteous. There is no need to be mean or rude. |
| 108 | +- We will exclude you from interaction if you insult, demean or harass anyone. |
| 109 | + In particular, we do not tolerate behavior that excludes people in socially |
| 110 | + marginalized groups. |
| 111 | +- Private harassment is also unacceptable. No matter who you are, if you feel |
| 112 | + you have been or are being harassed or made uncomfortable by a community |
| 113 | + member, please contact one of the channel ops or a member of the ORY |
| 114 | + Oathkeeper core team immediately. |
| 115 | +- Likewise any spamming, trolling, flaming, baiting or other attention-stealing |
| 116 | + behaviour is not welcome. |
| 117 | + |
| 118 | +We welcome discussion about creating a welcoming, safe, and productive |
| 119 | +environment for the community. If you have any questions, feedback, or concerns |
| 120 | +[please let us know](https://www.ory.sh/chat). |
0 commit comments