kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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

Browse source 
[Rails5] Update ar5_pg_10_support initializer

See merge request gitlab-org/gitlab-ce!17826
This commit is contained in:
Robert Speicher 2018-03-21 16:20:29 +00:00
commit 9942364f33
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
config/initializers/ar5_pg_10_support.rb
View file

@ -1,6 +1,5 @@
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'