Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShinya Maeda <shinya@gitlab.com>2017-11-07 15:23:54 +0300
committerShinya Maeda <shinya@gitlab.com>2017-11-07 15:23:54 +0300
commitbbdb0cf05141cdf9931e2aa673bf7a2ce5db0078 (patch)
treecf0e3da342c5543d817484d5130bc1e69012359a /spec/fixtures/api
parentce7b05f41d3941552320c23dc06f9f2b076099ed (diff)
parent666ab4882f2c6d385c04afe269ddf5b11f795b19 (diff)
Merge branch 'master' into 38464-k8s-apps
Diffstat (limited to 'spec/fixtures/api')
-rw-r--r--spec/fixtures/api/schemas/public_api/v4/merge_requests.json1
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/fixtures/api/schemas/public_api/v4/merge_requests.json b/spec/fixtures/api/schemas/public_api/v4/merge_requests.json
index 5828be5255b..034509091a5 100644
--- a/spec/fixtures/api/schemas/public_api/v4/merge_requests.json
+++ b/spec/fixtures/api/schemas/public_api/v4/merge_requests.json
@@ -70,6 +70,7 @@
"sha": { "type": "string" },
"merge_commit_sha": { "type": ["string", "null"] },
"user_notes_count": { "type": "integer" },
+ "changes_count": { "type": "string" },
"should_remove_source_branch": { "type": ["boolean", "null"] },
"force_remove_source_branch": { "type": ["boolean", "null"] },
"discussion_locked": { "type": ["boolean", "null"] },