diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 09:55:51 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 09:55:51 +0000 |
commit | e8d2c2579383897a1dd7f9debd359abe8ae8373d (patch) | |
tree | c42be41678c2586d49a75cabce89322082698334 /spec/fixtures/api/schemas | |
parent | fc845b37ec3a90aaa719975f607740c22ba6a113 (diff) | |
download | gitlab-ce-e8d2c2579383897a1dd7f9debd359abe8ae8373d.tar.gz |
Add latest changes from gitlab-org/gitlab@14-1-stable-eev14.1.0-rc42
Diffstat (limited to 'spec/fixtures/api/schemas')
-rw-r--r-- | spec/fixtures/api/schemas/cluster_status.json | 2 | ||||
-rw-r--r-- | spec/fixtures/api/schemas/entities/admin_users_data_attributes_paths.json | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/spec/fixtures/api/schemas/cluster_status.json b/spec/fixtures/api/schemas/cluster_status.json index ce62655648b..6f9535286ed 100644 --- a/spec/fixtures/api/schemas/cluster_status.json +++ b/spec/fixtures/api/schemas/cluster_status.json @@ -37,8 +37,6 @@ "hostname": { "type": ["string", "null"] }, "email": { "type": ["string", "null"] }, "stack": { "type": ["string", "null"] }, - "modsecurity_enabled": { "type": ["boolean", "null"] }, - "modsecurity_mode": {"type": ["integer", "0"]}, "host": {"type": ["string", "null"]}, "port": {"type": ["integer", "514"]}, "protocol": {"type": ["integer", "0"]}, diff --git a/spec/fixtures/api/schemas/entities/admin_users_data_attributes_paths.json b/spec/fixtures/api/schemas/entities/admin_users_data_attributes_paths.json index eab8b626876..44d8e48a972 100644 --- a/spec/fixtures/api/schemas/entities/admin_users_data_attributes_paths.json +++ b/spec/fixtures/api/schemas/entities/admin_users_data_attributes_paths.json @@ -11,7 +11,9 @@ "unlock": { "type": "string" }, "delete": { "type": "string" }, "delete_with_contributions": { "type": "string" }, - "admin_user": { "type": "string" } + "admin_user": { "type": "string" }, + "ban": { "type": "string" }, + "unban": { "type": "string" } }, "required": [ "edit", @@ -24,7 +26,9 @@ "unlock", "delete", "delete_with_contributions", - "admin_user" + "admin_user", + "ban", + "unban" ], "additionalProperties": false } |