[Rails5] Update ar5_pg_10_support initializer

cf0034bb · blackst0ne · 5ae91f32 · cf0034bb
Commit cf0034bb authored Mar 21, 2018 by blackst0ne
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

config/initializers/ar5_pg_10_support.rb config/initializers/ar5_pg_10_support.rb +2 -3

No files found.
--- a/config/initializers/ar5_pg_10_support.rb
+++ b/config/initializers/ar5_pg_10_support.rb
-raise "Vendored ActiveRecord 5 code! Delete #{__FILE__}!" if ActiveRecord::VERSION::MAJOR >= 5
-
-if Gitlab::Database.postgresql?
+# Remove this file when upgraded to rails 5.0.
+if !Gitlab.rails5? && Gitlab::Database.postgresql?
  require 'active_record/connection_adapters/postgresql_adapter'
  require 'active_record/connection_adapters/postgresql/schema_statements'