Commit aa6ab7cd authored by Toon Claes's avatar Toon Claes

Fix for spec/requests/api/boards_spec.rb

In gitlab-org/gitlab-ce!13283 extra properties were added to
BasicProjectDetails. This entity is used by the Board entity and the
API boards spec verifies the JSON schema for the
`/projects/:id/boards` endpoint.

So add the extra properties to the schema file.

A better solution would have been to extract the project into a
separate file. But that is outside the current scope.

This also correctly fixes the conflict introduced in 3c8b2ae1, and
resolved in 55a5f2ab49.
parent e666cf50
...@@ -14,21 +14,37 @@ ...@@ -14,21 +14,37 @@
"type": "object", "type": "object",
"required": [ "required": [
"id", "id",
"description",
"default_branch",
"tag_list",
"ssh_url_to_repo",
"http_url_to_repo",
"web_url",
"name", "name",
"name_with_namespace", "name_with_namespace",
"path", "path",
"path_with_namespace", "path_with_namespace",
"http_url_to_repo", "star_count",
"web_url" "forks_count",
"created_at",
"last_activity_at"
], ],
"properties": { "properties": {
"id": { "type": "integer" }, "id": { "type": "integer" },
"description": { "type": ["string", "null"] },
"default_branch": { "type": ["string", "null"] },
"tag_list": { "type": "array" },
"ssh_url_to_repo": { "type": "string" },
"http_url_to_repo": { "type": "string" },
"web_url": { "type": "string" },
"name": { "type": "string" }, "name": { "type": "string" },
"name_with_namespace": { "type": "string" }, "name_with_namespace": { "type": "string" },
"path": { "type": "string" }, "path": { "type": "string" },
"path_with_namespace": { "type": "string" }, "path_with_namespace": { "type": "string" },
"http_url_to_repo": { "type": "string" }, "star_count": { "type": "integer" },
"web_url": { "type": "string" } "forks_count": { "type": "integer" },
"created_at": { "type": "date" },
"last_activity_at": { "type": "date" }
}, },
"additionalProperties": false "additionalProperties": false
}, },
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment