summaryrefslogtreecommitdiff
path: root/spec/fixtures
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-11-30 18:09:46 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-11-30 18:09:46 +0000
commitace0df53d3ed38344b470727d430484d24eeb798 (patch)
treeec1fc71d793bf3d588df9fe97c4649c87e697e73 /spec/fixtures
parent56eafa995d0bbda39bc24cd07537286bf36a4dd9 (diff)
downloadgitlab-ce-ace0df53d3ed38344b470727d430484d24eeb798.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/fixtures')
-rw-r--r--spec/fixtures/api/schemas/entities/note_user_entity.json3
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/fixtures/api/schemas/entities/note_user_entity.json b/spec/fixtures/api/schemas/entities/note_user_entity.json
index 4a27d885cdc..e2bbaad7201 100644
--- a/spec/fixtures/api/schemas/entities/note_user_entity.json
+++ b/spec/fixtures/api/schemas/entities/note_user_entity.json
@@ -15,6 +15,7 @@
"path": { "type": "string" },
"name": { "type": "string" },
"username": { "type": "string" },
- "status_tooltip_html": { "$ref": "../types/nullable_string.json" }
+ "status_tooltip_html": { "$ref": "../types/nullable_string.json" },
+ "show_status": { "type": "boolean" }
}
}