From 1f54c9216f178e96010b28a74f04bae5848ef15d Mon Sep 17 00:00:00 2001 From: Oswaldo Ferreira Date: Tue, 3 Oct 2017 18:13:13 -0300 Subject: Reduce method calls while evaluating Projects::MergeRequestsController#show.json --- spec/fixtures/api/schemas/entities/merge_request.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'spec/fixtures') diff --git a/spec/fixtures/api/schemas/entities/merge_request.json b/spec/fixtures/api/schemas/entities/merge_request.json index 1030f323a1f..ce922ffad17 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" } -- cgit v1.2.1