Skip to content

Commit 8d69e61

Browse files
authored
Merge branch 'master' into feature/oidc-claims-web-hook-context
2 parents d78923d + dbf7274 commit 8d69e61

File tree

172 files changed

+5005
-1540
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

172 files changed

+5005
-1540
lines changed

.github/ISSUE_TEMPLATE/BUG-REPORT.yml

Lines changed: 36 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,48 @@
11
# AUTO-GENERATED, DO NOT EDIT!
22
# Please edit the original at https://github.com/ory/meta/blob/master/templates/repository/common/.github/ISSUE_TEMPLATE/BUG-REPORT.yml
33

4-
description: "Create a bug report"
4+
description: 'Create a bug report'
55
labels:
66
- bug
7-
name: "Bug Report"
7+
name: 'Bug Report'
88
body:
99
- attributes:
1010
value: "Thank you for taking the time to fill out this bug report!\n"
1111
type: markdown
1212
- attributes:
13-
label: "Preflight checklist"
13+
label: 'Preflight checklist'
1414
options:
15-
- label: "I could not find a solution in the existing issues, docs, nor
16-
discussions."
15+
- label:
16+
'I could not find a solution in the existing issues, docs, nor
17+
discussions.'
1718
required: true
18-
- label: "I agree to follow this project's [Code of
19+
- label:
20+
"I agree to follow this project's [Code of
1921
Conduct](https://github.com/ory/kratos/blob/master/CODE_OF_CONDUCT.md)."
2022
required: true
21-
- label: "I have read and am following this repository's [Contribution
23+
- label:
24+
"I have read and am following this repository's [Contribution
2225
Guidelines](https://github.com/ory/kratos/blob/master/CONTRIBUTING.md)."
2326
required: true
24-
- label: "I have joined the [Ory Community Slack](https://slack.ory.sh)."
25-
- label: "I am signed up to the [Ory Security Patch
26-
Newsletter](https://www.ory.sh/l/sign-up-newsletter)."
27+
- label:
28+
'I have joined the [Ory Community Slack](https://slack.ory.sh).'
29+
- label:
30+
'I am signed up to the [Ory Security Patch
31+
Newsletter](https://www.ory.sh/l/sign-up-newsletter).'
2732
id: checklist
2833
type: checkboxes
2934
- attributes:
3035
description:
31-
"Enter the slug or API URL of the affected Ory Network project. Leave
32-
empty when you are self-hosting."
33-
label: "Ory Network Project"
34-
placeholder: "https://<your-project-slug>.projects.oryapis.com"
36+
'Enter the slug or API URL of the affected Ory Network project. Leave
37+
empty when you are self-hosting.'
38+
label: 'Ory Network Project'
39+
placeholder: 'https://<your-project-slug>.projects.oryapis.com'
3540
id: ory-network-project
3641
type: input
3742
- attributes:
38-
description: "A clear and concise description of what the bug is."
39-
label: "Describe the bug"
40-
placeholder: "Tell us what you see!"
43+
description: 'A clear and concise description of what the bug is.'
44+
label: 'Describe the bug'
45+
placeholder: 'Tell us what you see!'
4146
id: describe-bug
4247
type: textarea
4348
validations:
@@ -51,27 +56,28 @@ body:
5156
1. Run `docker run ....`
5257
2. Make API Request to with `curl ...`
5358
3. Request fails with response: `{"some": "error"}`
54-
label: "Reproducing the bug"
59+
label: 'Reproducing the bug'
5560
id: reproduce-bug
5661
type: textarea
5762
validations:
5863
required: true
5964
- attributes:
60-
description: "Please copy and paste any relevant log output. This will be
65+
description:
66+
'Please copy and paste any relevant log output. This will be
6167
automatically formatted into code, so no need for backticks. Please
62-
redact any sensitive information"
63-
label: "Relevant log output"
68+
redact any sensitive information'
69+
label: 'Relevant log output'
6470
render: shell
6571
placeholder: |
6672
log=error ....
6773
id: logs
6874
type: textarea
6975
- attributes:
7076
description:
71-
"Please copy and paste any relevant configuration. This will be
77+
'Please copy and paste any relevant configuration. This will be
7278
automatically formatted into code, so no need for backticks. Please
73-
redact any sensitive information!"
74-
label: "Relevant configuration"
79+
redact any sensitive information!'
80+
label: 'Relevant configuration'
7581
render: yml
7682
placeholder: |
7783
server:
@@ -80,14 +86,14 @@ body:
8086
id: config
8187
type: textarea
8288
- attributes:
83-
description: "What version of our software are you running?"
89+
description: 'What version of our software are you running?'
8490
label: Version
8591
id: version
8692
type: input
8793
validations:
8894
required: true
8995
- attributes:
90-
label: "On which operating system are you observing this issue?"
96+
label: 'On which operating system are you observing this issue?'
9197
options:
9298
- Ory Network
9399
- macOS
@@ -98,19 +104,19 @@ body:
98104
id: operating-system
99105
type: dropdown
100106
- attributes:
101-
label: "In which environment are you deploying?"
107+
label: 'In which environment are you deploying?'
102108
options:
103109
- Ory Network
104110
- Docker
105-
- "Docker Compose"
106-
- "Kubernetes with Helm"
111+
- 'Docker Compose'
112+
- 'Kubernetes with Helm'
107113
- Kubernetes
108114
- Binary
109115
- Other
110116
id: deployment
111117
type: dropdown
112118
- attributes:
113-
description: "Add any other context about the problem here."
119+
description: 'Add any other context about the problem here.'
114120
label: Additional Context
115121
id: additional
116122
type: textarea

.github/ISSUE_TEMPLATE/DESIGN-DOC.yml

Lines changed: 27 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
# AUTO-GENERATED, DO NOT EDIT!
22
# Please edit the original at https://github.com/ory/meta/blob/master/templates/repository/common/.github/ISSUE_TEMPLATE/DESIGN-DOC.yml
33

4-
description: "A design document is needed for non-trivial changes to the code base."
4+
description:
5+
'A design document is needed for non-trivial changes to the code base.'
56
labels:
67
- rfc
7-
name: "Design Document"
8+
name: 'Design Document'
89
body:
910
- attributes:
1011
value: |
@@ -20,34 +21,39 @@ body:
2021
after code reviews, and your pull requests will be merged faster.
2122
type: markdown
2223
- attributes:
23-
label: "Preflight checklist"
24+
label: 'Preflight checklist'
2425
options:
25-
- label: "I could not find a solution in the existing issues, docs, nor
26-
discussions."
26+
- label:
27+
'I could not find a solution in the existing issues, docs, nor
28+
discussions.'
2729
required: true
28-
- label: "I agree to follow this project's [Code of
30+
- label:
31+
"I agree to follow this project's [Code of
2932
Conduct](https://github.com/ory/kratos/blob/master/CODE_OF_CONDUCT.md)."
3033
required: true
31-
- label: "I have read and am following this repository's [Contribution
34+
- label:
35+
"I have read and am following this repository's [Contribution
3236
Guidelines](https://github.com/ory/kratos/blob/master/CONTRIBUTING.md)."
3337
required: true
34-
- label: "I have joined the [Ory Community Slack](https://slack.ory.sh)."
35-
- label: "I am signed up to the [Ory Security Patch
36-
Newsletter](https://www.ory.sh/l/sign-up-newsletter)."
38+
- label:
39+
'I have joined the [Ory Community Slack](https://slack.ory.sh).'
40+
- label:
41+
'I am signed up to the [Ory Security Patch
42+
Newsletter](https://www.ory.sh/l/sign-up-newsletter).'
3743
id: checklist
3844
type: checkboxes
3945
- attributes:
4046
description:
41-
"Enter the slug or API URL of the affected Ory Network project. Leave
42-
empty when you are self-hosting."
43-
label: "Ory Network Project"
44-
placeholder: "https://<your-project-slug>.projects.oryapis.com"
47+
'Enter the slug or API URL of the affected Ory Network project. Leave
48+
empty when you are self-hosting.'
49+
label: 'Ory Network Project'
50+
placeholder: 'https://<your-project-slug>.projects.oryapis.com'
4551
id: ory-network-project
4652
type: input
4753
- attributes:
4854
description: |
4955
This section gives the reader a very rough overview of the landscape in which the new system is being built and what is actually being built. This isn’t a requirements doc. Keep it succinct! The goal is that readers are brought up to speed but some previous knowledge can be assumed and detailed info can be linked to. This section should be entirely focused on objective background facts.
50-
label: "Context and scope"
56+
label: 'Context and scope'
5157
id: scope
5258
type: textarea
5359
validations:
@@ -56,7 +62,7 @@ body:
5662
- attributes:
5763
description: |
5864
A short list of bullet points of what the goals of the system are, and, sometimes more importantly, what non-goals are. Note, that non-goals aren’t negated goals like “The system shouldn’t crash”, but rather things that could reasonably be goals, but are explicitly chosen not to be goals. A good example would be “ACID compliance”; when designing a database, you’d certainly want to know whether that is a goal or non-goal. And if it is a non-goal you might still select a solution that provides it, if it doesn’t introduce trade-offs that prevent achieving the goals.
59-
label: "Goals and non-goals"
65+
label: 'Goals and non-goals'
6066
id: goals
6167
type: textarea
6268
validations:
@@ -68,7 +74,7 @@ body:
6874
The design doc is the place to write down the trade-offs you made in designing your software. Focus on those trade-offs to produce a useful document with long-term value. That is, given the context (facts), goals and non-goals (requirements), the design doc is the place to suggest solutions and show why a particular solution best satisfies those goals.
6975
7076
The point of writing a document over a more formal medium is to provide the flexibility to express the problem at hand in an appropriate manner. Because of this, there is no explicit guidance on how to actually describe the design.
71-
label: "The design"
77+
label: 'The design'
7278
id: design
7379
type: textarea
7480
validations:
@@ -77,21 +83,21 @@ body:
7783
- attributes:
7884
description: |
7985
If the system under design exposes an API, then sketching out that API is usually a good idea. In most cases, however, one should withstand the temptation to copy-paste formal interface or data definitions into the doc as these are often verbose, contain unnecessary detail and quickly get out of date. Instead, focus on the parts that are relevant to the design and its trade-offs.
80-
label: "APIs"
86+
label: 'APIs'
8187
id: apis
8288
type: textarea
8389

8490
- attributes:
8591
description: |
8692
Systems that store data should likely discuss how and in what rough form this happens. Similar to the advice on APIs, and for the same reasons, copy-pasting complete schema definitions should be avoided. Instead, focus on the parts that are relevant to the design and its trade-offs.
87-
label: "Data storage"
93+
label: 'Data storage'
8894
id: persistence
8995
type: textarea
9096

9197
- attributes:
9298
description: |
9399
Design docs should rarely contain code, or pseudo-code except in situations where novel algorithms are described. As appropriate, link to prototypes that show the feasibility of the design.
94-
label: "Code and pseudo-code"
100+
label: 'Code and pseudo-code'
95101
id: pseudocode
96102
type: textarea
97103

@@ -104,7 +110,7 @@ body:
104110
On the other end are systems where the possible solutions are very well defined, but it isn't at all obvious how they could even be combined to achieve the goals. This may be a legacy system that is difficult to change and wasn't designed to do what you want it to do or a library design that needs to operate within the constraints of the host programming language.
105111
106112
In this situation, you may be able to enumerate all the things you can do relatively easily, but you need to creatively put those things together to achieve the goals. There may be multiple solutions, and none of them are great, and hence such a document should focus on selecting the best way given all identified trade-offs.
107-
label: "Degree of constraint"
113+
label: 'Degree of constraint'
108114
id: constrait
109115
type: textarea
110116

Lines changed: 28 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
# AUTO-GENERATED, DO NOT EDIT!
22
# Please edit the original at https://github.com/ory/meta/blob/master/templates/repository/common/.github/ISSUE_TEMPLATE/FEATURE-REQUEST.yml
33

4-
description: "Suggest an idea for this project without a plan for implementation"
4+
description:
5+
'Suggest an idea for this project without a plan for implementation'
56
labels:
67
- feat
7-
name: "Feature Request"
8+
name: 'Feature Request'
89
body:
910
- attributes:
1011
value: |
@@ -13,33 +14,39 @@ body:
1314
If you already have a plan to implement a feature or a change, please create a [design document](https://github.com/aeneasr/gh-template-test/issues/new?assignees=&labels=rfc&template=DESIGN-DOC.yml) instead if the change is non-trivial!
1415
type: markdown
1516
- attributes:
16-
label: "Preflight checklist"
17+
label: 'Preflight checklist'
1718
options:
18-
- label: "I could not find a solution in the existing issues, docs, nor
19-
discussions."
19+
- label:
20+
'I could not find a solution in the existing issues, docs, nor
21+
discussions.'
2022
required: true
21-
- label: "I agree to follow this project's [Code of
23+
- label:
24+
"I agree to follow this project's [Code of
2225
Conduct](https://github.com/ory/kratos/blob/master/CODE_OF_CONDUCT.md)."
2326
required: true
24-
- label: "I have read and am following this repository's [Contribution
27+
- label:
28+
"I have read and am following this repository's [Contribution
2529
Guidelines](https://github.com/ory/kratos/blob/master/CONTRIBUTING.md)."
2630
required: true
27-
- label: "I have joined the [Ory Community Slack](https://slack.ory.sh)."
28-
- label: "I am signed up to the [Ory Security Patch
29-
Newsletter](https://www.ory.sh/l/sign-up-newsletter)."
31+
- label:
32+
'I have joined the [Ory Community Slack](https://slack.ory.sh).'
33+
- label:
34+
'I am signed up to the [Ory Security Patch
35+
Newsletter](https://www.ory.sh/l/sign-up-newsletter).'
3036
id: checklist
3137
type: checkboxes
3238
- attributes:
3339
description:
34-
"Enter the slug or API URL of the affected Ory Network project. Leave
35-
empty when you are self-hosting."
36-
label: "Ory Network Project"
37-
placeholder: "https://<your-project-slug>.projects.oryapis.com"
40+
'Enter the slug or API URL of the affected Ory Network project. Leave
41+
empty when you are self-hosting.'
42+
label: 'Ory Network Project'
43+
placeholder: 'https://<your-project-slug>.projects.oryapis.com'
3844
id: ory-network-project
3945
type: input
4046
- attributes:
41-
description: "Is your feature request related to a problem? Please describe."
42-
label: "Describe your problem"
47+
description:
48+
'Is your feature request related to a problem? Please describe.'
49+
label: 'Describe your problem'
4350
placeholder:
4451
"A clear and concise description of what the problem is. Ex. I'm always
4552
frustrated when [...]"
@@ -52,27 +59,28 @@ body:
5259
Describe the solution you'd like
5360
placeholder: |
5461
A clear and concise description of what you want to happen.
55-
label: "Describe your ideal solution"
62+
label: 'Describe your ideal solution'
5663
id: solution
5764
type: textarea
5865
validations:
5966
required: true
6067
- attributes:
6168
description: "Describe alternatives you've considered"
62-
label: "Workarounds or alternatives"
69+
label: 'Workarounds or alternatives'
6370
id: alternatives
6471
type: textarea
6572
validations:
6673
required: true
6774
- attributes:
68-
description: "What version of our software are you running?"
75+
description: 'What version of our software are you running?'
6976
label: Version
7077
id: version
7178
type: input
7279
validations:
7380
required: true
7481
- attributes:
75-
description: "Add any other context or screenshots about the feature request here."
82+
description:
83+
'Add any other context or screenshots about the feature request here.'
7684
label: Additional Context
7785
id: additional
7886
type: textarea

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@ blank_issues_enabled: false
55
contact_links:
66
- name: Ory Kratos Forum
77
url: https://github.com/ory/kratos/discussions
8-
about: Please ask and answer questions here, show your implementations and
8+
about:
9+
Please ask and answer questions here, show your implementations and
910
discuss ideas.
1011
- name: Ory Chat
1112
url: https://www.ory.sh/chat
12-
about: Hang out with other Ory community members to ask and answer questions.
13+
about:
14+
Hang out with other Ory community members to ask and answer questions.

0 commit comments

Comments
 (0)