diff options
| author | blackst0ne <blackst0ne.ru@gmail.com> | 2018-03-21 09:21:33 +1100 |
|---|---|---|
| committer | blackst0ne <blackst0ne.ru@gmail.com> | 2018-03-21 09:21:33 +1100 |
| commit | cf0034bb7cdd8bdbfc2bf42971d4cf49f0ac9ed0 (patch) | |
| tree | a5716ec04c0561c42ed0231a7efd546860e88e25 | |
| parent | 5ae91f323d054341c0d012de85835ef40f1bf9f8 (diff) | |
| download | gitlab-ce-blackst0ne-rails5-update-ar5-pg-10-support-initializer.tar.gz | |
[Rails5] Update ar5_pg_10_support initializerblackst0ne-rails5-update-ar5-pg-10-support-initializer
| -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' |