diff options
| author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2016-04-23 22:47:50 -0500 |
|---|---|---|
| committer | Guillermo Iguaran <guilleiguaran@gmail.com> | 2016-04-23 22:47:50 -0500 |
| commit | 77f361736236e66eeed84ffce852f39b4347e36c (patch) | |
| tree | 93e86716e452caa5a3f297a10a9a8489928f6842 /activerecord/lib/active_record | |
| parent | 39f1dac9a5700c6601f671fea2e9b68b785c94d2 (diff) | |
| parent | 9c8a086863a9037f4fc936061642d312e4466096 (diff) | |
| download | rails-77f361736236e66eeed84ffce852f39b4347e36c.tar.gz rails-77f361736236e66eeed84ffce852f39b4347e36c.tar.bz2 rails-77f361736236e66eeed84ffce852f39b4347e36c.zip | |
Merge pull request #24707 from kamipo/move_require_ipaddr_to_oid_cidr
Move `require 'ipaddr'` in `postgresql/oid/cidr.rb`
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/postgresql/oid/cidr.rb | 2 | ||||
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/oid/cidr.rb b/activerecord/lib/active_record/connection_adapters/postgresql/oid/cidr.rb index eeccb09bdf..838cb63281 100644 --- a/activerecord/lib/active_record/connection_adapters/postgresql/oid/cidr.rb +++ b/activerecord/lib/active_record/connection_adapters/postgresql/oid/cidr.rb @@ -1,3 +1,5 @@ +require 'ipaddr' + module ActiveRecord module ConnectionAdapters module PostgreSQL diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb index 470e03b0ed..f52f27c84d 100644 --- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb @@ -16,8 +16,6 @@ require "active_record/connection_adapters/postgresql/type_metadata" require "active_record/connection_adapters/postgresql/utils" require "active_record/connection_adapters/statement_pool" -require 'ipaddr' - module ActiveRecord module ConnectionHandling # :nodoc: # Establishes a connection to the database that's used by all Active Record objects |