diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-05 21:07:46 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-05 21:07:46 +0000 |
| commit | 82cef8dd1f48ffbc7aaa1ff7374cdb859137e01e (patch) | |
| tree | 0ebdac2f1880dd1dd3f73a956082759314e0994f /doc/api | |
| parent | 2baa63e740214382387abe77eeea6c0b1759e621 (diff) | |
| download | gitlab-ce-82cef8dd1f48ffbc7aaa1ff7374cdb859137e01e.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/api')
| -rw-r--r-- | doc/api/commits.md | 1 | ||||
| -rw-r--r-- | doc/api/issues.md | 2 | ||||
| -rw-r--r-- | doc/api/merge_requests.md | 12 | ||||
| -rw-r--r-- | doc/api/search.md | 3 |
4 files changed, 18 insertions, 0 deletions
diff --git a/doc/api/commits.md b/doc/api/commits.md index 3927a4bbc62..3f2932f2666 100644 --- a/doc/api/commits.md +++ b/doc/api/commits.md @@ -670,6 +670,7 @@ Example response: "merge_status":"can_be_merged", "sha":"af5b13261899fb2c0db30abdd0af8b07cb44fdc5", "merge_commit_sha":null, + "squash_commit_sha":null, "user_notes_count":0, "discussion_locked":null, "should_remove_source_branch":null, diff --git a/doc/api/issues.md b/doc/api/issues.md index 0ddbb18ce92..ded412a7af0 100644 --- a/doc/api/issues.md +++ b/doc/api/issues.md @@ -1416,6 +1416,7 @@ Example response: "merge_status": "cannot_be_merged", "sha": "3b7b528e9353295c1c125dad281ac5b5deae5f12", "merge_commit_sha": null, + "squash_commit_sha": null, "discussion_locked": null, "should_remove_source_branch": null, "force_remove_source_branch": false, @@ -1546,6 +1547,7 @@ Example response: "merge_status": "unchecked", "sha": "5a62481d563af92b8e32d735f2fa63b94e806835", "merge_commit_sha": null, + "squash_commit_sha": null, "user_notes_count": 1, "should_remove_source_branch": null, "force_remove_source_branch": false, diff --git a/doc/api/merge_requests.md b/doc/api/merge_requests.md index ef5cbeb015e..7074d0249ef 100644 --- a/doc/api/merge_requests.md +++ b/doc/api/merge_requests.md @@ -126,6 +126,7 @@ Parameters: "merge_status": "can_be_merged", "sha": "8888888888888888888888888888888888888888", "merge_commit_sha": null, + "squash_commit_sha": null, "user_notes_count": 1, "discussion_locked": null, "should_remove_source_branch": true, @@ -287,6 +288,7 @@ Parameters: "merge_status": "can_be_merged", "sha": "8888888888888888888888888888888888888888", "merge_commit_sha": null, + "squash_commit_sha": null, "user_notes_count": 1, "discussion_locked": null, "should_remove_source_branch": true, @@ -440,6 +442,7 @@ Parameters: "merge_status": "can_be_merged", "sha": "8888888888888888888888888888888888888888", "merge_commit_sha": null, + "squash_commit_sha": null, "user_notes_count": 1, "discussion_locked": null, "should_remove_source_branch": true, @@ -563,6 +566,7 @@ Parameters: "merge_error": null, "sha": "8888888888888888888888888888888888888888", "merge_commit_sha": null, + "squash_commit_sha": null, "user_notes_count": 1, "discussion_locked": null, "should_remove_source_branch": true, @@ -769,6 +773,7 @@ Parameters: "subscribed" : true, "sha": "8888888888888888888888888888888888888888", "merge_commit_sha": null, + "squash_commit_sha": null, "user_notes_count": 1, "changes_count": "1", "should_remove_source_branch": true, @@ -976,6 +981,7 @@ order for it to take effect: "merge_error": null, "sha": "8888888888888888888888888888888888888888", "merge_commit_sha": null, + "squash_commit_sha": null, "user_notes_count": 1, "discussion_locked": null, "should_remove_source_branch": true, @@ -1129,6 +1135,7 @@ Must include at least one non-required attribute from above. "merge_error": null, "sha": "8888888888888888888888888888888888888888", "merge_commit_sha": null, + "squash_commit_sha": null, "user_notes_count": 1, "discussion_locked": null, "should_remove_source_branch": true, @@ -1298,6 +1305,7 @@ Parameters: "merge_error": null, "sha": "8888888888888888888888888888888888888888", "merge_commit_sha": null, + "squash_commit_sha": null, "user_notes_count": 1, "discussion_locked": null, "should_remove_source_branch": true, @@ -1470,6 +1478,7 @@ Parameters: "merge_error": null, "sha": "8888888888888888888888888888888888888888", "merge_commit_sha": null, + "squash_commit_sha": null, "user_notes_count": 1, "discussion_locked": null, "should_remove_source_branch": true, @@ -1755,6 +1764,7 @@ Example response: "merge_status": "can_be_merged", "sha": "8888888888888888888888888888888888888888", "merge_commit_sha": null, + "squash_commit_sha": null, "user_notes_count": 1, "discussion_locked": null, "should_remove_source_branch": true, @@ -1900,6 +1910,7 @@ Example response: "merge_status": "can_be_merged", "sha": "8888888888888888888888888888888888888888", "merge_commit_sha": null, + "squash_commit_sha": null, "user_notes_count": 1, "discussion_locked": null, "should_remove_source_branch": true, @@ -2061,6 +2072,7 @@ Example response: "subscribed": true, "sha": "8888888888888888888888888888888888888888", "merge_commit_sha": null, + "squash_commit_sha": null, "user_notes_count": 7, "changes_count": "1", "should_remove_source_branch": true, diff --git a/doc/api/search.md b/doc/api/search.md index f9bd5143018..8e20722052e 100644 --- a/doc/api/search.md +++ b/doc/api/search.md @@ -181,6 +181,7 @@ Example response: "merge_status": "can_be_merged", "sha": "78765a2d5e0a43585945c58e61ba2f822e4d090b", "merge_commit_sha": null, + "squash_commit_sha": null, "user_notes_count": 0, "discussion_locked": null, "should_remove_source_branch": null, @@ -583,6 +584,7 @@ Example response: "merge_status": "can_be_merged", "sha": "78765a2d5e0a43585945c58e61ba2f822e4d090b", "merge_commit_sha": null, + "squash_commit_sha": null, "user_notes_count": 0, "discussion_locked": null, "should_remove_source_branch": null, @@ -890,6 +892,7 @@ Example response: "merge_status": "can_be_merged", "sha": "78765a2d5e0a43585945c58e61ba2f822e4d090b", "merge_commit_sha": null, + "squash_commit_sha": null, "user_notes_count": 0, "discussion_locked": null, "should_remove_source_branch": null, |