From 859a6fb938bb9ee2a317c46dfa4fcc1af49608f0 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Thu, 18 Feb 2021 10:34:06 +0000
Subject: Add latest changes from gitlab-org/gitlab@13-9-stable-ee

---
 .../application_setting_kroki_formats.json         | 10 ++++++
 app/validators/json_schemas/git_trailers.json      |  9 +++++
 .../nested_attributes_duplicates_validator.rb      | 40 ++++++++++++++++++++++
 app/validators/variable_duplicates_validator.rb    | 34 ------------------
 4 files changed, 59 insertions(+), 34 deletions(-)
 create mode 100644 app/validators/json_schemas/application_setting_kroki_formats.json
 create mode 100644 app/validators/json_schemas/git_trailers.json
 create mode 100644 app/validators/nested_attributes_duplicates_validator.rb
 delete mode 100644 app/validators/variable_duplicates_validator.rb

(limited to 'app/validators')

diff --git a/app/validators/json_schemas/application_setting_kroki_formats.json b/app/validators/json_schemas/application_setting_kroki_formats.json
new file mode 100644
index 00000000000..460dc74069f
--- /dev/null
+++ b/app/validators/json_schemas/application_setting_kroki_formats.json
@@ -0,0 +1,10 @@
+{
+  "description": "Kroki formats",
+  "type": "object",
+  "properties": {
+    "bpmn": { "type": "boolean" },
+    "excalidraw": { "type": "boolean" },
+    "blockdiag": { "type": "boolean" }
+  },
+  "additionalProperties": false
+}
diff --git a/app/validators/json_schemas/git_trailers.json b/app/validators/json_schemas/git_trailers.json
new file mode 100644
index 00000000000..18ac97226a7
--- /dev/null
+++ b/app/validators/json_schemas/git_trailers.json
@@ -0,0 +1,9 @@
+{
+  "description": "Git trailer key/value pairs",
+  "type": "object",
+  "patternProperties": {
+    ".*": {
+      "type": "string"
+    }
+  }
+}
diff --git a/app/validators/nested_attributes_duplicates_validator.rb b/app/validators/nested_attributes_duplicates_validator.rb
new file mode 100644
index 00000000000..b60350a6311
--- /dev/null
+++ b/app/validators/nested_attributes_duplicates_validator.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+# NestedAttributesDuplicates
+#
+# This validator is designed for especially the following condition
+# - Use `accepts_nested_attributes_for :xxx` in a parent model
+# - Use `validates :xxx, uniqueness: { scope: :xxx_id }` in a child model
+class NestedAttributesDuplicatesValidator < ActiveModel::EachValidator
+  def validate_each(record, attribute, value)
+    return if child_attributes.any? { |child_attribute| record.errors.include?(:"#{attribute}.#{child_attribute}") }
+
+    if options[:scope]
+      scoped = value.group_by do |variable|
+        Array(options[:scope]).map { |attr| variable.send(attr) } # rubocop:disable GitlabSecurity/PublicSend
+      end
+      scoped.each_value { |scope| validate_duplicates(record, attribute, scope) }
+    else
+      validate_duplicates(record, attribute, value)
+    end
+  end
+
+  private
+
+  # rubocop: disable CodeReuse/ActiveRecord
+  def validate_duplicates(record, attribute, values)
+    child_attributes.each do |child_attribute|
+      duplicates = values.reject(&:marked_for_destruction?).group_by(&:"#{child_attribute}").select { |_, v| v.many? }.map(&:first)
+      if duplicates.any?
+        error_message = +"have duplicate values (#{duplicates.join(", ")})"
+        error_message << " for #{values.first.send(options[:scope])} scope" if options[:scope] # rubocop:disable GitlabSecurity/PublicSend
+        record.errors.add(attribute, error_message)
+      end
+    end
+  end
+  # rubocop: enable CodeReuse/ActiveRecord
+
+  def child_attributes
+    options[:child_attributes] || %i[key]
+  end
+end
diff --git a/app/validators/variable_duplicates_validator.rb b/app/validators/variable_duplicates_validator.rb
deleted file mode 100644
index d36a56e81b9..00000000000
--- a/app/validators/variable_duplicates_validator.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-
-# VariableDuplicatesValidator
-#
-# This validator is designed for especially the following condition
-# - Use `accepts_nested_attributes_for :xxx` in a parent model
-# - Use `validates :xxx, uniqueness: { scope: :xxx_id }` in a child model
-class VariableDuplicatesValidator < ActiveModel::EachValidator
-  def validate_each(record, attribute, value)
-    return if record.errors.include?(:"#{attribute}.key")
-
-    if options[:scope]
-      scoped = value.group_by do |variable|
-        Array(options[:scope]).map { |attr| variable.send(attr) } # rubocop:disable GitlabSecurity/PublicSend
-      end
-      scoped.each_value { |scope| validate_duplicates(record, attribute, scope) }
-    else
-      validate_duplicates(record, attribute, value)
-    end
-  end
-
-  private
-
-  # rubocop: disable CodeReuse/ActiveRecord
-  def validate_duplicates(record, attribute, values)
-    duplicates = values.reject(&:marked_for_destruction?).group_by(&:key).select { |_, v| v.many? }.map(&:first)
-    if duplicates.any?
-      error_message = +"have duplicate values (#{duplicates.join(", ")})"
-      error_message << " for #{values.first.send(options[:scope])} scope" if options[:scope] # rubocop:disable GitlabSecurity/PublicSend
-      record.errors.add(attribute, error_message)
-    end
-  end
-  # rubocop: enable CodeReuse/ActiveRecord
-end
-- 
cgit v1.2.3