diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-09-01 00:39:43 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-09-01 00:39:43 +0000 |
| commit | 21b7e203b3d0b3048cd5f860e602d8a18655f118 (patch) | |
| tree | 508e57775ff761599b25ca499daa15551e33c85e /spec | |
| parent | f9b96bd273c636c41e0160b97ea9182f97339f26 (diff) | |
| parent | 5e5a16a5a8777f6de466f1e790a53a8a1c5b53d7 (diff) | |
| download | gitlab-ce-21b7e203b3d0b3048cd5f860e602d8a18655f118.tar.gz | |
Merge branch 'feature/#32877-add-default-field-branch-api' into 'master'
Add default parameter to branches API
Closes #32877
See merge request gitlab-org/gitlab-ce!21294
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/fixtures/api/schemas/public_api/v4/branch.json | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/spec/fixtures/api/schemas/public_api/v4/branch.json b/spec/fixtures/api/schemas/public_api/v4/branch.json index a8891680d06..3b0f010bc4f 100644 --- a/spec/fixtures/api/schemas/public_api/v4/branch.json +++ b/spec/fixtures/api/schemas/public_api/v4/branch.json @@ -5,6 +5,7 @@ "commit", "merged", "protected", + "default", "developers_can_push", "developers_can_merge" ], @@ -13,6 +14,7 @@ "commit": { "$ref": "commit/basic.json" }, "merged": { "type": "boolean" }, "protected": { "type": "boolean" }, + "default": { "type": "boolean" }, "developers_can_push": { "type": "boolean" }, "developers_can_merge": { "type": "boolean" }, "can_push": { "type": "boolean" } |