Commit 9942364f authored by Robert Speicher's avatar Robert Speicher

Merge branch 'blackst0ne-rails5-update-ar5-pg-10-support-initializer' into 'master'

[Rails5] Update ar5_pg_10_support initializer

See merge request gitlab-org/gitlab-ce!17826
parents 90aec15e cf0034bb
raise "Vendored ActiveRecord 5 code! Delete #{__FILE__}!" if ActiveRecord::VERSION::MAJOR >= 5 # Remove this file when upgraded to rails 5.0.
if !Gitlab.rails5? && Gitlab::Database.postgresql?
if Gitlab::Database.postgresql?
require 'active_record/connection_adapters/postgresql_adapter' require 'active_record/connection_adapters/postgresql_adapter'
require 'active_record/connection_adapters/postgresql/schema_statements' require 'active_record/connection_adapters/postgresql/schema_statements'
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment