diff options
| author | Luke Duncalfe <lduncalfe@gitlab.com> | 2019-02-06 15:33:11 +0300 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2019-02-06 15:33:11 +0300 |
| commit | 2b7dd017af7de4d09ef3a1cd835e8d07c8800b6a (patch) | |
| tree | 47615a573f6dc932353f0f6695cd4fcd050b1201 /spec/fixtures | |
| parent | 5bfa8e2f5e03849645570ba8c2dbfcc5c834f1b1 (diff) | |
Allow custom squash commit messages
Diffstat (limited to 'spec/fixtures')
| -rw-r--r-- | spec/fixtures/api/schemas/entities/merge_request_widget.json | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/spec/fixtures/api/schemas/entities/merge_request_widget.json b/spec/fixtures/api/schemas/entities/merge_request_widget.json index 1bd39a46830..67c209f3fc3 100644 --- a/spec/fixtures/api/schemas/entities/merge_request_widget.json +++ b/spec/fixtures/api/schemas/entities/merge_request_widget.json @@ -44,7 +44,7 @@ "merge_user": { "type": ["object", "null"] }, "diff_head_sha": { "type": ["string", "null"] }, "diff_head_commit_short_id": { "type": ["string", "null"] }, - "merge_commit_message": { "type": ["string", "null"] }, + "default_merge_commit_message": { "type": ["string", "null"] }, "pipeline": { "type": ["object", "null"] }, "merge_pipeline": { "type": ["object", "null"] }, "work_in_progress": { "type": "boolean" }, @@ -102,7 +102,9 @@ "new_blob_path": { "type": ["string", "null"] }, "merge_check_path": { "type": "string" }, "ci_environments_status_path": { "type": "string" }, - "merge_commit_message_with_description": { "type": "string" }, + "default_merge_commit_message_with_description": { "type": "string" }, + "default_squash_commit_message": { "type": "string" }, + "commits_without_merge_commits": { "type": "array" }, "diverged_commits_count": { "type": "integer" }, "commit_change_content_path": { "type": "string" }, "merge_commit_path": { "type": ["string", "null"] }, |