diff options
author | Bob Van Landuyt <bob@gitlab.com> | 2018-10-05 17:45:51 +0000 |
---|---|---|
committer | Bob Van Landuyt <bob@gitlab.com> | 2018-10-05 17:45:51 +0000 |
commit | b82cdf0ec0eb662ffe61ab1b9e9abfb881e0d2a1 (patch) | |
tree | 9a8eb16f1114605e31ad6df2de58b1f55adbdd2c /spec/fixtures | |
parent | aa53ae8aac79420bdc52c2d1c006bab097ac1719 (diff) | |
parent | 96faeb330860d8f6c509947e9f683c337ccdb6f8 (diff) | |
download | gitlab-ce-b82cdf0ec0eb662ffe61ab1b9e9abfb881e0d2a1.tar.gz |
Merge branch 'security-osw-user-info-leak-discussions' into 'master'
[security - master] Filter user sensitive data from discussions JSON
See merge request gitlab/gitlabhq!2536
Diffstat (limited to 'spec/fixtures')
-rw-r--r-- | spec/fixtures/api/schemas/entities/note_user_entity.json | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/spec/fixtures/api/schemas/entities/note_user_entity.json b/spec/fixtures/api/schemas/entities/note_user_entity.json new file mode 100644 index 00000000000..9b838054563 --- /dev/null +++ b/spec/fixtures/api/schemas/entities/note_user_entity.json @@ -0,0 +1,21 @@ +{ + "type": "object", + "required": [ + "id", + "state", + "avatar_url", + "path", + "name", + "username" + ], + "properties": { + "id": { "type": "integer" }, + "state": { "type": "string" }, + "avatar_url": { "type": "string" }, + "path": { "type": "string" }, + "name": { "type": "string" }, + "username": { "type": "string" }, + "status_tooltip_html": { "$ref": "../types/nullable_string.json" } + }, + "additionalProperties": false +} |