Add latest changes from gitlab-org/gitlab@master

2 files changed, 28 insertions, 18 deletions

diff --git a/lib/gitlab/database/type/symbolized_jsonb.rb b/lib/gitlab/database/type/symbolized_jsonb.rb
new file mode 100644
index 00000000000..5bec738ec9c
--- /dev/null
+++ b/lib/gitlab/database/type/symbolized_jsonb.rb
@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module Database
+    module Type
+      # Extends Rails' Jsonb data type to deserialize it into symbolized Hash.
+      #
+      # Example:
+      #
+      #   class SomeModel < ApplicationRecord
+      #     # some_model.a_field is of type `jsonb`
+      #     attribute :a_field, :sym_jsonb
+      #   end
+      class SymbolizedJsonb < ::ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Jsonb
+        def type
+          :sym_jsonb
+        end
+
+        def deserialize(value)
+          data = super
+          return unless data
+
+          ::Gitlab::Utils.deep_symbolized_access(data)
+        end
+      end
+    end
+  end
+end
diff --git a/lib/serializers/symbolized_json.rb b/lib/serializers/symbolized_json.rb
deleted file mode 100644
index 78192ce3132..00000000000
--- a/lib/serializers/symbolized_json.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-module Serializers
-  # Make the resulting hash have deep symbolized keys
-  class SymbolizedJson
-    class << self
-      def dump(obj)
-        obj
-      end
-
-      def load(data)
-        return if data.nil?
-
-        Gitlab::Utils.deep_symbolized_access(data)
-      end
-    end
-  end
-end