diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-06-28 11:56:47 -0700 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-06-28 15:59:45 -0300 |
| commit | 10e568577536460647f97dbcc5b9d1777937f5e8 (patch) | |
| tree | ad41dddf5523968c2dae5b74b5233a43bdf8db60 /activerecord/lib | |
| parent | 3fccf6af7d389445089195c7c28d95e9bce40364 (diff) | |
| download | rails-10e568577536460647f97dbcc5b9d1777937f5e8.tar.gz rails-10e568577536460647f97dbcc5b9d1777937f5e8.tar.bz2 rails-10e568577536460647f97dbcc5b9d1777937f5e8.zip | |
Merge pull request #6900 from cbandy/issue-6898
Require URI in ConnectionSpecification
Conflicts:
activerecord/lib/active_record/connection_adapters/connection_specification.rb
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb b/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb index 7145dc0692..6c8a102caf 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb @@ -1,3 +1,5 @@ +require 'uri' + module ActiveRecord class Base class ConnectionSpecification #:nodoc: |