diff options
| author | Nick Thomas <nick@gitlab.com> | 2019-01-08 15:05:43 +0000 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2019-01-08 15:05:43 +0000 |
| commit | 5a827e0c00066a6b4ce4051108f91c798d07e5bf (patch) | |
| tree | 31a16933f9cfbb3afee3763e4313c0341a0aa8be /spec/fixtures | |
| parent | 148969947ffd3d2b69c786b9babaed64bba3df9d (diff) | |
| parent | aae6d174948a238abf05af2d3038d80b5e8750f4 (diff) | |
| download | gitlab-ce-5a827e0c00066a6b4ce4051108f91c798d07e5bf.tar.gz | |
Merge branch 'mr-widget-conflicts-protected-branch' into 'master'
Disable resolve conflicts for protected branches
Closes #53463
See merge request gitlab-org/gitlab-ce!23842
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 } |