summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axil@gitlab.com>2018-06-04 08:02:50 +0000
committerAchilleas Pipinellis <axil@gitlab.com>2018-06-04 08:02:50 +0000
commit9b20be45e99e9589626f47798e3565f102168b1f (patch)
tree581bb7130cd2d1bea28bb7f6128a2c35f0b3bc68
parent7b00bc5b2f51a66b8dc8e63c47b13940010dd68d (diff)
parentd10a70a0c56e648d961f4246ab4f64dcee0da5ac (diff)
downloadgitlab-ce-9b20be45e99e9589626f47798e3565f102168b1f.tar.gz
Merge branch 'sh-add-missing-squash-param-api-docs' into 'master'
Fix missing squash parameter in doc/api/merge_requests.md See merge request gitlab-org/gitlab-ce!19260
-rw-r--r--doc/api/merge_requests.md1
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/api/merge_requests.md b/doc/api/merge_requests.md
index 051d2a10bc6..62f9884e264 100644
--- a/doc/api/merge_requests.md
+++ b/doc/api/merge_requests.md
@@ -582,6 +582,7 @@ Parameters:
"changes_count": "1",
"should_remove_source_branch": true,
"force_remove_source_branch": false,
+ "squash": false,
"web_url": "http://example.com/example/example/merge_requests/1",
"discussion_locked": false,
"time_stats": {