diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-09-20 15:23:00 +0100 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-09-20 15:23:00 +0100 |
| commit | ff7b545c8e462b909af92a5bea58de779c3f438b (patch) | |
| tree | bdd6a8bc3c8527df2925288348c752eb87d1b9ea /spec/fixtures | |
| parent | 55a7529621515eaeffa1424a281e639cf74be6cf (diff) | |
| parent | ff1deab6388dcb7f241205a1cd64eaddf1672753 (diff) | |
| download | gitlab-ce-ff7b545c8e462b909af92a5bea58de779c3f438b.tar.gz | |
Merge remote-tracking branch 'origin/master' into 18608-lock-issues
Diffstat (limited to 'spec/fixtures')
| -rw-r--r-- | spec/fixtures/api/schemas/public_api/v4/issues.json | 1 | ||||
| -rw-r--r-- | spec/fixtures/api/schemas/public_api/v4/user/admins.json | 4 | ||||
| -rw-r--r-- | spec/fixtures/api/schemas/public_api/v4/user/basics.json | 4 |
3 files changed, 9 insertions, 0 deletions
diff --git a/spec/fixtures/api/schemas/public_api/v4/issues.json b/spec/fixtures/api/schemas/public_api/v4/issues.json index b7d6dbff031..5c08dbc3b96 100644 --- a/spec/fixtures/api/schemas/public_api/v4/issues.json +++ b/spec/fixtures/api/schemas/public_api/v4/issues.json @@ -10,6 +10,7 @@ "description": { "type": ["string", "null"] }, "state": { "type": "string" }, "discussion_locked": { "type": ["boolean", "null"] }, + "closed_at": { "type": "date" }, "created_at": { "type": "date" }, "updated_at": { "type": "date" }, "labels": { diff --git a/spec/fixtures/api/schemas/public_api/v4/user/admins.json b/spec/fixtures/api/schemas/public_api/v4/user/admins.json new file mode 100644 index 00000000000..4a107f0ddbe --- /dev/null +++ b/spec/fixtures/api/schemas/public_api/v4/user/admins.json @@ -0,0 +1,4 @@ +{ + "type": "array", + "items": { "$ref": "admin.json" } +} diff --git a/spec/fixtures/api/schemas/public_api/v4/user/basics.json b/spec/fixtures/api/schemas/public_api/v4/user/basics.json new file mode 100644 index 00000000000..6f7cf42229d --- /dev/null +++ b/spec/fixtures/api/schemas/public_api/v4/user/basics.json @@ -0,0 +1,4 @@ +{ + "type": "array", + "items": { "$ref": "basic.json" } +} |