Add latest changes from gitlab-org/gitlab@master

3 files changed, 33 insertions, 32 deletions

diff --git a/config/events/1659626567_analytics_usage_action_perform_analytics_usage_action.yml b/config/events/1659626567_analytics_usage_action_perform_analytics_usage_action.yml
new file mode 100644
index 00000000000..ff1fb8e9408
--- /dev/null
+++ b/config/events/1659626567_analytics_usage_action_perform_analytics_usage_action.yml
@@ -0,0 +1,25 @@
+---
+description: Analytics usage event
+category: class of the controller triggering given event
+action: perform_analytics_usage_action
+label_description: key_path of corresponding redis hll total metric
+property_description: the name of the performed action, corresponding to migrated redis hll event name
+value_description:
+extra_properties:
+identifiers:
+- user
+- namespace
+product_section: dev
+product_stage: manage
+product_group: optimize
+product_category:
+milestone: "15.3"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/94369
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
+
diff --git a/config/feature_flags/ops/batched_migrations_health_status_wal.yml b/config/feature_flags/ops/batched_migrations_health_status_wal.yml
new file mode 100644
index 00000000000..dfef528ee39
--- /dev/null
+++ b/config/feature_flags/ops/batched_migrations_health_status_wal.yml
@@ -0,0 +1,8 @@
+---
+name: batched_migrations_health_status_wal
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/84555
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/366855
+milestone: '15.2'
+type: ops
+group: group::database
+default_enabled: false
diff --git a/config/initializers/rails_safe_load_yaml_patch.rb b/config/initializers/rails_safe_load_yaml_patch.rb
deleted file mode 100644
index dcc0426673a..00000000000
--- a/config/initializers/rails_safe_load_yaml_patch.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-# frozen_string_literal: true
-# rubocop:disable Database/MultipleDatabases
-
-raise 'This patch should be dropped after upgrading Rails v6.1.6.1' if ActiveRecord::VERSION::STRING != "6.1.6.1"
-
-module ActiveRecord
-  module Coders # :nodoc:
-    class YAMLColumn # :nodoc:
-      private
-
-      def yaml_load(payload)
-        return legacy_yaml_load(payload) if ActiveRecord::Base.use_yaml_unsafe_load
-
-        YAML.safe_load(payload, permitted_classes: ActiveRecord::Base.yaml_column_permitted_classes, aliases: true)
-      rescue Psych::DisallowedClass => e
-        Gitlab::ErrorTracking.track_and_raise_for_dev_exception(e)
-
-        legacy_yaml_load(payload)
-      end
-
-      def legacy_yaml_load(payload)
-        if YAML.respond_to?(:unsafe_load)
-          YAML.unsafe_load(payload)
-        else
-          YAML.load(payload) # rubocop:disable Security/YAMLLoad
-        end
-      end
-    end
-  end
-end
-
-# rubocop:enable Database/MultipleDatabases