Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update release notes and prepare 0.10.0 #685

Merged
merged 9 commits into from
Dec 8, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,12 +102,14 @@ jobs:
- run: npm i -g doctoc
- run: github_changelog_generator -u ory -p hydra -o CHANGELOG.md --token $GITHUB_TOKEN
- run: doctoc CHANGELOG.md
- run: git config --global user.email "circleci@ory.am"
- run: git config --global user.name "ORY Continuous Integration"
- run: git add CHANGELOG.md
- run: |
git commit -m "docs: Incorporates changes from version $(git describe --tags)" -- CHANGELOG.md
- run: git remote rm origin
- run: git remote add origin https://arekkas:$GITHUB_TOKEN@github.com/ory/hydra.git
- run: git push origin
- run: git push origin HEAD:master

workflows:
version: 2
Expand Down
252 changes: 131 additions & 121 deletions UPGRADE.md

Large diffs are not rendered by default.

20 changes: 16 additions & 4 deletions docs/SUMMARY.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,23 @@
* [OAuth2 Scopes](oauth2.md#oauth2-scopes)
* [JSON Web Keys](jwk.md)
* [Access Control](access-control.md)
* [Access Control Policies](access-control.md#access-control-policies)
* [Introduction](access-control.md#introduction)
* [Best Practices](access-control.md#best-practices)
* [The Warden](access-control.md#warden)
- [Introduction](access-control.md#introduction)
- [Warden API](access-control.md#warden-api)
- [Groups](access-control.md#groups)
- [Best Practices](access-control.md#best-practices)
- [Scalability](access-control.md#scalability)
- [URNs](access-control.md#urns)
- [Scope the Organization Name](access-control.md#scope-the-organization-name)
- [Scope Actions, Resources and Subjects](access-control.md#scope-actions-resources-and-subjects)
- [Multi-Tenant Systems](access-control.md#multi-tenant-systems)
- [Conditions & Context](access-control.md#conditions-&-context)
- [CIDR Condition](access-control.md#cidr-condition)
- [String Equal Condition](access-control.md#string-equal-condition)
- [String Match Condition](access-control.md#string-match-condition)
- [Subject Condition](access-control.md#subject-condition)
- [String Pairs Equal Condition](access-control.md#string-pairs-equal-condition)
- [Install, Configure and Run ORY Hydra (15 minutes)](install.md#install-configure-and-run-ory-hydra)
- [Create a Network](install.md#create-a-network)
- [Start a PostgreSQL container](install.md#start-a-postgresql-container)
- [Install and run ORY Hydra](install.md#install-and-run-ory-hydra)
- [Install ORY Hydra without Docker](install.md#install-ory-hydra-without-docker)
Expand Down
Loading