Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into hperl/exp/grpc-gateway
Browse files Browse the repository at this point in the history
  • Loading branch information
hperl committed Feb 23, 2023
2 parents e588023 + ce92728 commit 1452688
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 3 deletions.
10 changes: 8 additions & 2 deletions .schema/config.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -311,10 +311,10 @@
"enum": ["cpu", "mem", ""]
},
"log": {
"$ref": "https://raw.githubusercontent.com/ory/x/v0.0.496/logrusx/config.schema.json"
"$ref": "https://raw.githubusercontent.com/ory/x/v0.0.541/logrusx/config.schema.json"
},
"tracing": {
"$ref": "https://raw.githubusercontent.com/ory/x/v0.0.496/tracing/config.schema.json"
"$ref": "https://raw.githubusercontent.com/ory/x/v0.0.541/tracing/config.schema.json"
},
"namespaces": {
"description": "Namespace configuration or it's location.",
Expand Down Expand Up @@ -347,8 +347,14 @@
"file:///etc/configs/keto_namespaces.ts",
"ws://my.websocket.server/keto_namespaces.ts"
]
},
"experimental_strict_mode": {
"type": "boolean",
"title": "Strict permission checking mode",
"description": "EXPERIMENTAL: If strict mode is enabled, then relation tuples for permits are not checked directly (but the rewrites are applied). Similarly, subject sets are only expanded if they were declared with SubjectSet<...>. These stricter rules result in much faster checks with fewer queries to the underlying database. The behavior of strict mode might change while it is experimental."
}
},
"additionalProperties": false,
"required": ["location"]
}
]
Expand Down
3 changes: 2 additions & 1 deletion spec/goswagger.swagger.json
Original file line number Diff line number Diff line change
Expand Up @@ -467,6 +467,7 @@
{
"type": "integer",
"format": "int64",
"description": "nolint:deadcode,unused",
"name": "max-depth",
"in": "query"
},
Expand Down Expand Up @@ -1089,7 +1090,7 @@
},
"responses": {
"emptyResponse": {
"description": "Empty responses are sent when, for example, resources are deleted. The HTTP status code for empty responses is typically 201."
"description": "Empty responses are sent when, for example, resources are deleted. The HTTP status code for empty responses is typically 204."
}
}
}

0 comments on commit 1452688

Please sign in to comment.