summaryrefslogtreecommitdiff
path: root/spec/fixtures
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-01-02 21:07:38 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-01-02 21:07:38 +0000
commit9d54184f308893338967b18874dedebf38acf89e (patch)
tree100e32c6d4b34deac52d9e98a083361d89804b50 /spec/fixtures
parentd5b5f5e6e1474d5526add9033c9754b8e395841f (diff)
downloadgitlab-ce-9d54184f308893338967b18874dedebf38acf89e.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/fixtures')
-rw-r--r--spec/fixtures/api/schemas/evidences/milestone.json9
-rw-r--r--spec/fixtures/not_a_png.pngbin0 -> 72642 bytes
2 files changed, 2 insertions, 7 deletions
diff --git a/spec/fixtures/api/schemas/evidences/milestone.json b/spec/fixtures/api/schemas/evidences/milestone.json
index ab27fdecde2..3ce0644225b 100644
--- a/spec/fixtures/api/schemas/evidences/milestone.json
+++ b/spec/fixtures/api/schemas/evidences/milestone.json
@@ -7,8 +7,7 @@
"state",
"iid",
"created_at",
- "due_date",
- "issues"
+ "due_date"
],
"properties": {
"id": { "type": "integer" },
@@ -17,11 +16,7 @@
"state": { "type": "string" },
"iid": { "type": "integer" },
"created_at": { "type": "date" },
- "due_date": { "type": ["date", "null"] },
- "issues": {
- "type": "array",
- "items": { "$ref": "issue.json" }
- }
+ "due_date": { "type": ["date", "null"] }
},
"additionalProperties": false
}
diff --git a/spec/fixtures/not_a_png.png b/spec/fixtures/not_a_png.png
new file mode 100644
index 00000000000..932f9efaed9
--- /dev/null
+++ b/spec/fixtures/not_a_png.png
Binary files differ