diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2021-01-20 22:34:23 +0300 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2021-01-20 22:34:23 +0300 |
| commit | 6438df3a1e0fb944485cebf07976160184697d72 (patch) | |
| tree | 00b09bfd170e77ae9391b1a2f5a93ef6839f2597 /app/validators | |
| parent | 42bcd54d971da7ef2854b896a7b34f4ef8601067 (diff) | |
Add latest changes from gitlab-org/gitlab@13-8-stable-eev13.8.0-rc42
Diffstat (limited to 'app/validators')
3 files changed, 14 insertions, 4 deletions
diff --git a/app/validators/feature_flag_strategies_validator.rb b/app/validators/feature_flag_strategies_validator.rb index e542d52c50a..a933a307626 100644 --- a/app/validators/feature_flag_strategies_validator.rb +++ b/app/validators/feature_flag_strategies_validator.rb @@ -1,9 +1,9 @@ # frozen_string_literal: true class FeatureFlagStrategiesValidator < ActiveModel::EachValidator - STRATEGY_DEFAULT = 'default'.freeze - STRATEGY_GRADUALROLLOUTUSERID = 'gradualRolloutUserId'.freeze - STRATEGY_USERWITHID = 'userWithId'.freeze + STRATEGY_DEFAULT = 'default' + STRATEGY_GRADUALROLLOUTUSERID = 'gradualRolloutUserId' + STRATEGY_USERWITHID = 'userWithId' # Order key names alphabetically STRATEGIES = { STRATEGY_DEFAULT => [].freeze, diff --git a/app/validators/json_schemas/debian_fields.json b/app/validators/json_schemas/debian_fields.json new file mode 100644 index 00000000000..b9f6ad2b31d --- /dev/null +++ b/app/validators/json_schemas/debian_fields.json @@ -0,0 +1,9 @@ +{ + "description": "Debian fields", + "type": "object", + "patternProperties": { + ".*": { + "type": "string" + } + } +} diff --git a/app/validators/json_schemas/http_integration_payload_attribute_mapping.json b/app/validators/json_schemas/http_integration_payload_attribute_mapping.json index e457b8a292b..a194daf5e45 100644 --- a/app/validators/json_schemas/http_integration_payload_attribute_mapping.json +++ b/app/validators/json_schemas/http_integration_payload_attribute_mapping.json @@ -6,7 +6,8 @@ "required": ["path", "type"], "properties": { "path": { "type": "array" }, - "type": { "type": "string" } + "type": { "type": "string" }, + "label": { "type": ["string", "null"] } }, "additionalProperties": false } |