diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-05-07 22:17:55 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-05-07 22:17:55 +0000 |
| commit | b69ade5dd1eca99bff388240a184b6a579196f9d (patch) | |
| tree | bc568a5af275a74d29c92235a9695f47aca13378 /spec/fixtures | |
| parent | 4ac42e48344d4971913e8ed4afca27d0bdf07929 (diff) | |
| parent | 3063225ca289e87c3f590e1722451a1c674e2ac9 (diff) | |
| download | gitlab-ce-b69ade5dd1eca99bff388240a184b6a579196f9d.tar.gz | |
Merge branch '43557-osw-present-merge-sha-commit' into 'master'
Resolve "Display merge commit SHA in merge widget after merge"
Closes #43557
See merge request gitlab-org/gitlab-ce!18722
Diffstat (limited to 'spec/fixtures')
| -rw-r--r-- | spec/fixtures/api/schemas/entities/merge_request_widget.json | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/spec/fixtures/api/schemas/entities/merge_request_widget.json b/spec/fixtures/api/schemas/entities/merge_request_widget.json index a622bf88b13..233102c4314 100644 --- a/spec/fixtures/api/schemas/entities/merge_request_widget.json +++ b/spec/fixtures/api/schemas/entities/merge_request_widget.json @@ -22,6 +22,7 @@ "in_progress_merge_commit_sha": { "type": ["string", "null"] }, "merge_error": { "type": ["string", "null"] }, "merge_commit_sha": { "type": ["string", "null"] }, + "short_merge_commit_sha": { "type": ["string", "null"] }, "merge_params": { "type": ["object", "null"] }, "merge_status": { "type": "string" }, "merge_user_id": { "type": ["integer", "null"] }, @@ -100,6 +101,7 @@ "merge_commit_message_with_description": { "type": "string" }, "diverged_commits_count": { "type": "integer" }, "commit_change_content_path": { "type": "string" }, + "merge_commit_path": { "type": ["string", "null"] }, "remove_wip_path": { "type": ["string", "null"] }, "commits_count": { "type": "integer" }, "remove_source_branch": { "type": ["boolean", "null"] }, |