diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-18 06:12:04 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-18 06:12:04 +0300 |
| commit | a3633566291bf9889f2e03e7e2d472f5bc5a5c9f (patch) | |
| tree | 1c98fd309cb08d5ef0439334854be9af007066ed /config/initializers | |
| parent | 5f9ac8c745b8c727859e3c0a97bf88ec7a228dac (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/active_record_data_types.rb | 3 | ||||
| -rw-r--r-- | config/initializers/types.rb | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/config/initializers/active_record_data_types.rb b/config/initializers/active_record_data_types.rb index 7f4bd32c221..b57d3bb5df1 100644 --- a/config/initializers/active_record_data_types.rb +++ b/config/initializers/active_record_data_types.rb @@ -5,6 +5,9 @@ require 'active_record/connection_adapters/postgresql_adapter' +ActiveRecord::Type.register(:ind_jsonb, Gitlab::Database::Type::IndifferentJsonb) +ActiveRecord::Type.register(:sym_jsonb, Gitlab::Database::Type::SymbolizedJsonb) + module ActiveRecord::ConnectionAdapters::PostgreSQL::OID # Add the class `DateTimeWithTimeZone` so we can map `timestamptz` to it. class DateTimeWithTimeZone < DateTime diff --git a/config/initializers/types.rb b/config/initializers/types.rb deleted file mode 100644 index 4a20e257469..00000000000 --- a/config/initializers/types.rb +++ /dev/null @@ -1,3 +0,0 @@ -# frozen_string_literal: true - -ActiveRecord::Type.register(:sym_jsonb, Gitlab::Database::Type::SymbolizedJsonb) |