Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-04-29 15:10:00 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-04-29 15:10:00 +0300
commit4233d3aa86fe94e6288279aa55d42ed95bfe753c (patch)
tree7b97b519371f6df1fa6a0f2ffe69535207a73754 /spec/fixtures
parente357d4951c53a3ce4f696cf533ce24a4c6350a7e (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/fixtures')
-rw-r--r--spec/fixtures/api/schemas/public_api/v4/branch.json6
1 files changed, 4 insertions, 2 deletions
diff --git a/spec/fixtures/api/schemas/public_api/v4/branch.json b/spec/fixtures/api/schemas/public_api/v4/branch.json
index 3b0f010bc4f..0073a6d89fc 100644
--- a/spec/fixtures/api/schemas/public_api/v4/branch.json
+++ b/spec/fixtures/api/schemas/public_api/v4/branch.json
@@ -7,7 +7,8 @@
"protected",
"default",
"developers_can_push",
- "developers_can_merge"
+ "developers_can_merge",
+ "web_url"
],
"properties" : {
"name": { "type": "string" },
@@ -17,7 +18,8 @@
"default": { "type": "boolean" },
"developers_can_push": { "type": "boolean" },
"developers_can_merge": { "type": "boolean" },
- "can_push": { "type": "boolean" }
+ "can_push": { "type": "boolean" },
+ "web_url": { "type": "uri" }
},
"additionalProperties": false
}