diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-19 01:45:44 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-19 01:45:44 +0000 |
| commit | 85dc423f7090da0a52c73eb66faf22ddb20efff9 (patch) | |
| tree | 9160f299afd8c80c038f08e1545be119f5e3f1e1 /spec/fixtures/api/schemas/entities/merge_request_poll_cached_widget.json | |
| parent | 15c2c8c66dbe422588e5411eee7e68f1fa440bb8 (diff) | |
| download | gitlab-ce-85dc423f7090da0a52c73eb66faf22ddb20efff9.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-4-stable-ee
Diffstat (limited to 'spec/fixtures/api/schemas/entities/merge_request_poll_cached_widget.json')
| -rw-r--r-- | spec/fixtures/api/schemas/entities/merge_request_poll_cached_widget.json | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/fixtures/api/schemas/entities/merge_request_poll_cached_widget.json b/spec/fixtures/api/schemas/entities/merge_request_poll_cached_widget.json index b40b71d2cd6..3d6b20896ce 100644 --- a/spec/fixtures/api/schemas/entities/merge_request_poll_cached_widget.json +++ b/spec/fixtures/api/schemas/entities/merge_request_poll_cached_widget.json @@ -7,8 +7,8 @@ "title": { "type": "string" }, "auto_merge_enabled": { "type": "boolean" }, "state": { "type": "string" }, - "merge_commit_sha": { "type": ["string", "null"] }, - "short_merge_commit_sha": { "type": ["string", "null"] }, + "merged_commit_sha": { "type": ["string", "null"] }, + "short_merged_commit_sha": { "type": ["string", "null"] }, "merge_error": { "type": ["string", "null"] }, "merge_status": { "type": "string" }, "merge_user_id": { "type": ["integer", "null"] }, @@ -40,7 +40,7 @@ "diverged_commits_count": { "type": "integer" }, "target_branch_commits_path": { "type": "string" }, "target_branch_tree_path": { "type": "string" }, - "merge_commit_path": { "type": ["string", "null"] }, + "merged_commit_path": { "type": ["string", "null"] }, "source_branch_with_namespace_link": { "type": "string" }, "source_branch_path": { "type": "string" } } |