Add latest changes from gitlab-org/gitlab@master

2 files changed, 12 insertions, 0 deletions

diff --git a/app/validators/json_schema_validator.rb b/app/validators/json_schema_validator.rb
index f84186c9ced..f8c1727035c 100644
--- a/app/validators/json_schema_validator.rb
+++ b/app/validators/json_schema_validator.rb
@@ -10,8 +10,12 @@
 #   end
 #
 class JsonSchemaValidator < ActiveModel::EachValidator
+  FILENAME_ALLOWED = /\A[a-z0-9_-]*\Z/.freeze
+  FilenameError = Class.new(StandardError)
+
   def initialize(options)
     raise ArgumentError, "Expected 'filename' as an argument" unless options[:filename]
+    raise FilenameError, "Must be a valid 'filename'" unless options[:filename].match?(FILENAME_ALLOWED)
 
     super(options)
   end
diff --git a/app/validators/json_schemas/daily_build_group_report_result_data.json b/app/validators/json_schemas/daily_build_group_report_result_data.json
new file mode 100644
index 00000000000..2524ac63050
--- /dev/null
+++ b/app/validators/json_schemas/daily_build_group_report_result_data.json
@@ -0,0 +1,8 @@
+{
+  "description": "Daily build group report result data",
+  "type": "object",
+  "properties": {
+    "coverage": { "type": "float" }
+  },
+  "additionalProperties": false
+}