diff options
| author | Oswaldo Ferreira <oswaldo@gitlab.com> | 2017-07-31 19:01:36 -0300 |
|---|---|---|
| committer | Oswaldo Ferreira <oswaldo@gitlab.com> | 2017-08-07 15:23:37 -0300 |
| commit | 0640b3d1d89b7a4eda343eb23b0518a835ac9106 (patch) | |
| tree | 13970b43017ada593f08b70ca713dc19a1f064cf /spec/fixtures | |
| parent | b12107a0b953b566cd58db30ae880800a4a695a6 (diff) | |
| download | gitlab-ce-0640b3d1d89b7a4eda343eb23b0518a835ac9106.tar.gz | |
Store MergeWorker JID on merge request, and clean up stuck merges
Diffstat (limited to 'spec/fixtures')
| -rw-r--r-- | spec/fixtures/api/schemas/entities/merge_request.json | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/fixtures/api/schemas/entities/merge_request.json b/spec/fixtures/api/schemas/entities/merge_request.json index 7ffa82fc4bd..2f12b671dec 100644 --- a/spec/fixtures/api/schemas/entities/merge_request.json +++ b/spec/fixtures/api/schemas/entities/merge_request.json @@ -19,7 +19,6 @@ "human_time_estimate": { "type": ["integer", "null"] }, "human_total_time_spent": { "type": ["integer", "null"] }, "in_progress_merge_commit_sha": { "type": ["string", "null"] }, - "locked_at": { "type": ["string", "null"] }, "merge_error": { "type": ["string", "null"] }, "merge_commit_sha": { "type": ["string", "null"] }, "merge_params": { "type": ["object", "null"] }, @@ -94,7 +93,8 @@ "commit_change_content_path": { "type": "string" }, "remove_wip_path": { "type": "string" }, "commits_count": { "type": "integer" }, - "remove_source_branch": { "type": ["boolean", "null"] } + "remove_source_branch": { "type": ["boolean", "null"] }, + "merge_ongoing": { "type": "boolean" } }, "additionalProperties": false } |