From b23a5ae9b789a2dec4ac5219a99f3874b6c66b82 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Mon, 27 Jan 2020 13:53:11 +0900 Subject: [PATCH 1/2] Fix robot comment id field names in changes REST documentation The fields are named robot_run_id and robot_id in the JSON output, but the examples showed them as robotRunId and robotId. Change-Id: Ie0e8e0035fe4c067a6e192ca4c33453192197a63 --- Documentation/rest-api-changes.txt | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Documentation/rest-api-changes.txt b/Documentation/rest-api-changes.txt index a7367f346a..96f367f06e 100644 --- a/Documentation/rest-api-changes.txt +++ b/Documentation/rest-api-changes.txt @@ -1962,8 +1962,8 @@ map are sorted by file path. "name": "Code Analyzer", "email": "code.analyzer@example.com" }, - "robotId": "importChecker", - "robotRunId": "76b1375aa8626ea7149792831fe2ed85e80d9e04" + "robot_id": "importChecker", + "robot_run_id": "76b1375aa8626ea7149792831fe2ed85e80d9e04" }, { "id": "TveXwFiA", @@ -1975,8 +1975,8 @@ map are sorted by file path. "name": "Code Analyzer", "email": "code.analyzer@example.com" }, - "robotId": "styleChecker", - "robotRunId": "5c606c425dd45184484f9d0a2ffd725a7607839b" + "robot_id": "styleChecker", + "robot_run_id": "5c606c425dd45184484f9d0a2ffd725a7607839b" } ] } @@ -4719,8 +4719,8 @@ map are sorted by file path. "name": "Code Analyzer", "email": "code.analyzer@example.com" }, - "robotId": "importChecker", - "robotRunId": "76b1375aa8626ea7149792831fe2ed85e80d9e04" + "robot_id": "importChecker", + "robot_run_id": "76b1375aa8626ea7149792831fe2ed85e80d9e04" }, { "id": "TveXwFiA", @@ -4732,8 +4732,8 @@ map are sorted by file path. "name": "Code Analyzer", "email": "code.analyzer@example.com" }, - "robotId": "styleChecker", - "robotRunId": "5c606c425dd45184484f9d0a2ffd725a7607839b" + "robot_id": "styleChecker", + "robot_run_id": "5c606c425dd45184484f9d0a2ffd725a7607839b" } ] } @@ -4773,8 +4773,8 @@ returned that describes the robot comment. "name": "Code Analyzer", "email": "code.analyzer@example.com" }, - "robotId": "importChecker", - "robotRunId": "76b1375aa8626ea7149792831fe2ed85e80d9e04" + "robot_id": "importChecker", + "robot_run_id": "76b1375aa8626ea7149792831fe2ed85e80d9e04" } ---- From bd2af0ce4a7061b4985e361e8ffee11218b8229f Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Thu, 9 Jan 2020 16:39:26 +0100 Subject: [PATCH 2/2] Documentation: fix camelCase in MergePatchSetInput entity documentation Change-Id: Id50ace328128cda386f3c11e3b87fc4af1efe505 --- Documentation/rest-api-changes.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/rest-api-changes.txt b/Documentation/rest-api-changes.txt index 96f367f06e..a691db10c1 100644 --- a/Documentation/rest-api-changes.txt +++ b/Documentation/rest-api-changes.txt @@ -6632,10 +6632,10 @@ change by creating a new merge commit. |`subject` |optional| The new subject for the change, if not specified, will reuse the current patch set's subject -|`inheritParent` |optional, default to `false`| +|`inherit_parent` |optional, default to `false`| Use the current patch set's first parent as the merge tip when set to `true`. |`base_change` |optional| -A link:#change-id[\{change-id\}] that identifies a change. When `inheritParent` +A link:#change-id[\{change-id\}] that identifies a change. When `inherit_parent` is `false`, the merge tip will be the current patch set of the `base_change` if it's set. Otherwise, the current branch tip of the destination branch will be used. |`merge` ||