diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-03-21 16:20:29 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-03-21 16:20:29 +0000 |
| commit | 9942364f33c2949b003f9c4a26d60f1d10548756 (patch) | |
| tree | 73f0f30056a748491ed18ede47683228230c4eb9 /config | |
| parent | 90aec15e3599a4816779a6cd3c19743044f5fb38 (diff) | |
| parent | cf0034bb7cdd8bdbfc2bf42971d4cf49f0ac9ed0 (diff) | |
| download | gitlab-ce-9942364f33c2949b003f9c4a26d60f1d10548756.tar.gz | |
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
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/ar5_pg_10_support.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/config/initializers/ar5_pg_10_support.rb b/config/initializers/ar5_pg_10_support.rb index a529c74a8ce..40548290ce8 100644 --- a/config/initializers/ar5_pg_10_support.rb +++ b/config/initializers/ar5_pg_10_support.rb @@ -1,6 +1,5 @@ -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' |