Skip to content

Commit

Permalink
Merge from origin
Browse files Browse the repository at this point in the history
  • Loading branch information
fjvierap committed Sep 23, 2021
2 parents 5b01e58 + beb72e4 commit 7d770e0
Show file tree
Hide file tree
Showing 273 changed files with 3,508 additions and 10,030 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
version: 2.1

orbs:
goreleaser: ory/goreleaser@0.1.31
goreleaser: ory/goreleaser@0.1.34
slack: circleci/slack@3.4.2
sdk: ory/sdk@0.1.41
sdk: ory/sdk@0.1.43
changelog: ory/changelog@0.1.10
nancy: ory/nancy@0.0.18
docs: ory/docs@0.0.11
Expand Down
3 changes: 1 addition & 2 deletions .docker/Dockerfile-build
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@ RUN mkdir -p /var/lib/sqlite
RUN chown ory:ory /var/lib/sqlite
VOLUME /var/lib/sqlite

# Exposing the ory home directory to simplify passing in hydra configuration (e.g. if the file $HOME/.hydra.yaml
# exists, it will be automatically used as the configuration file).
# Exposing the ory home directory
VOLUME /home/ory

# Declare the standard ports used by hydra (4433 for public service endpoint, 4434 for admin service endpoint)
Expand Down
3 changes: 1 addition & 2 deletions .docker/Dockerfile-sqlite
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ RUN mkdir -p /var/lib/sqlite
RUN chown ory:ory /var/lib/sqlite
VOLUME /var/lib/sqlite

# Exposing the ory home directory to simplify passing in Hydra configuration (e.g. if the file $HOME/.hydra.yaml
# exists, it will be automatically used as the configuration file).
# Exposing the ory home directory
VOLUME /home/ory

# Declare the standard ports used by Hydra (4433 for public service endpoint, 4434 for admin service endpoint)
Expand Down
1 change: 0 additions & 1 deletion .github/CODEOWNER

This file was deleted.

3 changes: 3 additions & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
* @aeneasr

/docs/ @ory/documenters
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ contact_links:
about: Please ask and answer questions here, show your implementations and discuss ideas.
- name: Ory Chat
url: https://www.ory.sh/chat
about: Hang out with other Ory community members and ask and answer questions.
about: Hang out with other Ory community members to ask and answer questions.
- name: Ory Support for Business
url: https://github.com/ory/open-source-support/blob/master/README.md
about: Buy professional support for Ory Hydra.
3 changes: 3 additions & 0 deletions .github/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
todo:
keyword: "@todo"
label: todo
39 changes: 29 additions & 10 deletions .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,36 @@ jobs:
if: github.repository_owner == 'ory'
runs-on: ubuntu-latest
steps:
- uses: actions/stale@v3
- uses: actions/stale@v4
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.
Hello contributors!
I am marking this issue as stale as it has not received any engagement from the community or maintainers a year. That does not imply that the issue has no merit! If you feel strongly about this issue
- open a PR referencing and resolving the issue;
- leave a comment on it and discuss ideas how you could contribute towards resolving it;
- leave a comment and describe in detail why this issue is critical for your use case;
- open a new issue with updated details and a plan on resolving the issue.
Throughout its lifetime, Ory has received over 10.000 issues and PRs. To sustain that growth, we need to prioritize and focus on issues that are important to the community. A good indication of importance, and thus priority, is activity on a topic.
Unfortunately, [burnout](https://www.jeffgeerling.com/blog/2016/why-i-close-prs-oss-project-maintainer-notes) has become a [topic](https://opensource.guide/best-practices/#its-okay-to-hit-pause) of [concern](https://docs.brew.sh/Maintainers-Avoiding-Burnout) amongst open-source projects.
It can lead to severe personal and health issues as well as [opening](https://haacked.com/archive/2019/05/28/maintainer-burnout/) catastrophic [attack vectors](https://www.gradiant.org/en/blog/open-source-maintainer-burnout-as-an-attack-surface/).
The motivation for this automation is to help prioritize issues in the backlog and not ignore, reject, or belittle anyone.
If this issue was marked as stale erroneous you can exempt it by adding the `backlog` label, assigning someone, or setting a milestone for it.
Thank you for your understanding and to anyone who participated in the conversation! And as written above, please do participate in the conversation if this topic is important to you!
Thank you 🙏✌️
stale-issue-label: 'stale'
stale-pr-label: 'stale'
only-labels: 'needs more info'
days-before-stale: 7
days-before-close: 7
exempt-issue-labels: 'bug,blocking,docs,backlog'
days-before-stale: 365
days-before-close: 30
exempt-milestones: true
exempt-assignees: true
only-pr-labels: 'stale'
42 changes: 42 additions & 0 deletions .schema/version.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,48 @@
"$ref": "https://raw.githubusercontent.com/ory/hydra/v1.10.3/spec/config.json"
}
]
},
{
"allOf": [
{
"properties": {
"version": {
"const": "v1.10.5-pre.1"
}
}
},
{
"$ref": "https://raw.githubusercontent.com/ory/hydra/v1.10.5-pre.1/spec/config.json"
}
]
},
{
"allOf": [
{
"properties": {
"version": {
"const": "v1.10.5"
}
}
},
{
"$ref": "https://raw.githubusercontent.com/ory/hydra/v1.10.5/spec/config.json"
}
]
},
{
"allOf": [
{
"properties": {
"version": {
"const": "v1.10.6"
}
}
},
{
"$ref": "https://raw.githubusercontent.com/ory/hydra/v1.10.6/spec/config.json"
}
]
}
]
}
Loading

0 comments on commit 7d770e0

Please sign in to comment.