From ac1dca43baa7b3b1ac7d60d89ad60fdeefed0b80 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 9 Mar 2020 12:07:45 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/fixtures/api/schemas/remote_mirror.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'spec/fixtures/api/schemas') diff --git a/spec/fixtures/api/schemas/remote_mirror.json b/spec/fixtures/api/schemas/remote_mirror.json index 416b0f080d9..87bde189db5 100644 --- a/spec/fixtures/api/schemas/remote_mirror.json +++ b/spec/fixtures/api/schemas/remote_mirror.json @@ -10,7 +10,7 @@ "last_successful_update_at", "last_error", "only_protected_branches" - ], + ], "properties": { "id": { "type": "integer" }, "enabled": { "type": "boolean" }, @@ -20,7 +20,8 @@ "last_update_started_at": { "type": ["string", "null"] }, "last_successful_update_at": { "type": ["string", "null"] }, "last_error": { "type": ["string", "null"] }, - "only_protected_branches": { "type": "boolean" } + "only_protected_branches": { "type": "boolean" }, + "keep_divergent_refs": { "type": ["boolean", "null"] } }, "additionalProperties": false } -- cgit v1.2.1