diff options
| author | José Valim <jose.valim@gmail.com> | 2009-07-28 09:00:33 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2009-07-28 09:00:33 +0200 |
| commit | d9aae2b56e64a4f417eaffa99e10cca274e928e7 (patch) | |
| tree | 8438f6f784df9b252c0f834bc7cb9c369103d4cd /activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb | |
| parent | 5025ae610f89989f3e15241ec7065e3d443614d9 (diff) | |
| parent | 9533e0eca76b1df68a90e1ebe395d7b6a59d8e91 (diff) | |
| download | rails-d9aae2b56e64a4f417eaffa99e10cca274e928e7.tar.gz rails-d9aae2b56e64a4f417eaffa99e10cca274e928e7.tar.bz2 rails-d9aae2b56e64a4f417eaffa99e10cca274e928e7.zip | |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb index 500dafdc2e..12253eac3f 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb @@ -362,7 +362,7 @@ module ActiveRecord def call(env) @app.call(env) ensure - # Don't return connection (and peform implicit rollback) if + # Don't return connection (and perform implicit rollback) if # this request is a part of integration test unless env.key?("rack.test") ActiveRecord::Base.clear_active_connections! |