summaryrefslogtreecommitdiff
path: root/doc/api/issues.md
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-11-05 21:07:46 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-11-05 21:07:46 +0000
commit82cef8dd1f48ffbc7aaa1ff7374cdb859137e01e (patch)
tree0ebdac2f1880dd1dd3f73a956082759314e0994f /doc/api/issues.md
parent2baa63e740214382387abe77eeea6c0b1759e621 (diff)
downloadgitlab-ce-82cef8dd1f48ffbc7aaa1ff7374cdb859137e01e.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/api/issues.md')
-rw-r--r--doc/api/issues.md2
1 files changed, 2 insertions, 0 deletions
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,