summaryrefslogtreecommitdiff
path: root/spec/fixtures
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-21 00:09:18 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-21 00:09:18 +0000
commit1ccf61bdccd3f0cbcabd7fe335542014f465f46b (patch)
treef6eb90ccf27bb2193251d1617e7b655429eb2ac6 /spec/fixtures
parent68f1860e6f1f9e8441c434f4e62238c359ce8c7c (diff)
downloadgitlab-ce-1ccf61bdccd3f0cbcabd7fe335542014f465f46b.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/fixtures')
-rw-r--r--spec/fixtures/api/schemas/entities/user.json3
1 files changed, 1 insertions, 2 deletions
diff --git a/spec/fixtures/api/schemas/entities/user.json b/spec/fixtures/api/schemas/entities/user.json
index 1e0c8885609..82d80b75cef 100644
--- a/spec/fixtures/api/schemas/entities/user.json
+++ b/spec/fixtures/api/schemas/entities/user.json
@@ -17,8 +17,7 @@
"path": { "type": "string" },
"name": { "type": "string" },
"username": { "type": "string" },
- "status_tooltip_html": { "$ref": "../types/nullable_string.json" },
- "is_gitlab_employee": { "type": "boolean" }
+ "status_tooltip_html": { "$ref": "../types/nullable_string.json" }
},
"additionalProperties": false
}