diff options
| author | Phil Hughes <me@iamphill.com> | 2018-12-21 10:47:03 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-01-07 09:17:04 +0000 |
| commit | aae6d174948a238abf05af2d3038d80b5e8750f4 (patch) | |
| tree | 4fd28fc7358cb7602ffd527e152260c90a1f4da0 /spec/fixtures | |
| parent | 301315f3b3e5ffe43c3de1f7f15e4e3a307c0912 (diff) | |
| download | gitlab-ce-aae6d174948a238abf05af2d3038d80b5e8750f4.tar.gz | |
Disable resolve conflicts for protected branches
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53463
Diffstat (limited to 'spec/fixtures')
| -rw-r--r-- | spec/fixtures/api/schemas/entities/merge_request_widget.json | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/spec/fixtures/api/schemas/entities/merge_request_widget.json b/spec/fixtures/api/schemas/entities/merge_request_widget.json index 193ab6821a5..1bd39a46830 100644 --- a/spec/fixtures/api/schemas/entities/merge_request_widget.json +++ b/spec/fixtures/api/schemas/entities/merge_request_widget.json @@ -120,7 +120,9 @@ "rebase_path": { "type": ["string", "null"] }, "squash": { "type": "boolean" }, "test_reports_path": { "type": ["string", "null"] }, - "can_receive_suggestion": { "type": "boolean" } + "can_receive_suggestion": { "type": "boolean" }, + "source_branch_protected": { "type": "boolean" }, + "conflicts_docs_path": { "type": ["string", "null"] } }, "additionalProperties": false } |