diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-10-04 07:33:05 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-10-04 07:33:05 +0000 |
| commit | 2ee93c486cfbdf5555677d570cc63d1542c159ba (patch) | |
| tree | 269fb45d8daf58258be607fab36118ab73590e8e /spec/fixtures | |
| parent | aaa57c9d35b1eb744fca970263220850db06639f (diff) | |
| parent | 1f54c9216f178e96010b28a74f04bae5848ef15d (diff) | |
| download | gitlab-ce-2ee93c486cfbdf5555677d570cc63d1542c159ba.tar.gz | |
Merge branch '36876-mr-show-json-controller-perf-improvements' into 'master'
Reduce method calls while evaluating Projects::MergeRequestsController#show.json
See merge request gitlab-org/gitlab-ce!14285
Diffstat (limited to 'spec/fixtures')
| -rw-r--r-- | spec/fixtures/api/schemas/entities/merge_request.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/fixtures/api/schemas/entities/merge_request.json b/spec/fixtures/api/schemas/entities/merge_request.json index 0796d9b8af9..30b4e56bc98 100644 --- a/spec/fixtures/api/schemas/entities/merge_request.json +++ b/spec/fixtures/api/schemas/entities/merge_request.json @@ -93,7 +93,7 @@ "merge_commit_message_with_description": { "type": "string" }, "diverged_commits_count": { "type": "integer" }, "commit_change_content_path": { "type": "string" }, - "remove_wip_path": { "type": "string" }, + "remove_wip_path": { "type": ["string", "null"] }, "commits_count": { "type": "integer" }, "remove_source_branch": { "type": ["boolean", "null"] }, "merge_ongoing": { "type": "boolean" }, |