diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 00:10:04 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 00:10:04 +0300 |
| commit | 83d921d51bd5bf8bd0ecd078706d7c037fb711cb (patch) | |
| tree | f8f43552f05e747c06d16ac82b23eb33182a9e8f /config | |
| parent | a8476fe0cd764ac054763032b7cf6e63b0b493c5 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/active_record_postgresql_adapter.rb | 2 | ||||
| -rw-r--r-- | config/initializers/global_id.rb | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/config/initializers/active_record_postgresql_adapter.rb b/config/initializers/active_record_postgresql_adapter.rb index 6bf38506e37..14bc7153f44 100644 --- a/config/initializers/active_record_postgresql_adapter.rb +++ b/config/initializers/active_record_postgresql_adapter.rb @@ -4,6 +4,6 @@ if Gitlab::Utils.to_boolean(ENV['ENABLE_ACTIVERECORD_EMPTY_PING'], default: true ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.prepend(Gitlab::Database::PostgresqlAdapter::EmptyQueryPing) end -if Gitlab::Utils.to_boolean(ENV['ENABLE_ACTIVERECORD_TYPEMAP_CACHE'], default: false) +if Gitlab::Utils.to_boolean(ENV['ENABLE_ACTIVERECORD_TYPEMAP_CACHE'], default: true) ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.prepend(Gitlab::Database::PostgresqlAdapter::TypeMapCache) end diff --git a/config/initializers/global_id.rb b/config/initializers/global_id.rb new file mode 100644 index 00000000000..8f1b8f2aeeb --- /dev/null +++ b/config/initializers/global_id.rb @@ -0,0 +1,3 @@ +# frozen_string_literal: true + +GlobalID.prepend(Gitlab::Patch::GlobalID) |