diff options
| author | Valery Sizov <valery@gitlab.com> | 2017-10-02 12:54:28 +0300 |
|---|---|---|
| committer | Valery Sizov <valery@gitlab.com> | 2017-10-02 12:54:28 +0300 |
| commit | 284185a35641eb83ae9b91582f3b61f9f6bf061b (patch) | |
| tree | b7b0ea913d77337ee2dc9c632915e6b566730ad9 /spec | |
| parent | 439e3f073591b41ef9926a4b8c33000ae1b068f7 (diff) | |
| download | gitlab-ce-284185a35641eb83ae9b91582f3b61f9f6bf061b.tar.gz | |
Add merge_requests_rebase_enabled to json entities for specs
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/fixtures/api/schemas/entities/merge_request.json | 3 | ||||
| -rw-r--r-- | spec/lib/gitlab/import_export/safe_model_attributes.yml | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/spec/fixtures/api/schemas/entities/merge_request.json b/spec/fixtures/api/schemas/entities/merge_request.json index 3bae98467a7..0796d9b8af9 100644 --- a/spec/fixtures/api/schemas/entities/merge_request.json +++ b/spec/fixtures/api/schemas/entities/merge_request.json @@ -97,7 +97,8 @@ "commits_count": { "type": "integer" }, "remove_source_branch": { "type": ["boolean", "null"] }, "merge_ongoing": { "type": "boolean" }, - "ff_only_enabled": { "type": ["boolean", false] } + "ff_only_enabled": { "type": ["boolean", false] }, + "should_be_rebased": { "type": "boolean" } }, "additionalProperties": false } diff --git a/spec/lib/gitlab/import_export/safe_model_attributes.yml b/spec/lib/gitlab/import_export/safe_model_attributes.yml index 64b8e7f7e18..7268226112c 100644 --- a/spec/lib/gitlab/import_export/safe_model_attributes.yml +++ b/spec/lib/gitlab/import_export/safe_model_attributes.yml @@ -413,6 +413,7 @@ Project: - ci_config_path - delete_error - merge_requests_ff_only_enabled +- merge_requests_rebase_enabled Author: - name ProjectFeature: |