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
This commit is contained in:
Achilleas Pipinellis 2018-06-04 08:02:50 +00:00
commit 9b20be45e9

View file

@ -582,6 +582,7 @@ Parameters:
"changes_count": "1", "changes_count": "1",
"should_remove_source_branch": true, "should_remove_source_branch": true,
"force_remove_source_branch": false, "force_remove_source_branch": false,
"squash": false,
"web_url": "http://example.com/example/example/merge_requests/1", "web_url": "http://example.com/example/example/merge_requests/1",
"discussion_locked": false, "discussion_locked": false,
"time_stats": { "time_stats": {