aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorप्रथमेश Sonpatki <csonpatki@gmail.com>2016-06-20 22:12:15 +0800
committerGitHub <noreply@github.com>2016-06-20 22:12:15 +0800
commit998d3044515f37c252cf5acfe923c4b69dcbd33c (patch)
tree76b65239ea59bcc299a5e5739762f85ecedb742d
parent0c998a14c45430afe85188f8ad13a696b077ffd9 (diff)
parent33c78c3787bbad534e08e8f3be53a6c971a8e339 (diff)
downloadrails-998d3044515f37c252cf5acfe923c4b69dcbd33c.tar.gz
rails-998d3044515f37c252cf5acfe923c4b69dcbd33c.tar.bz2
rails-998d3044515f37c252cf5acfe923c4b69dcbd33c.zip
Merge pull request #25449 from alexcameron89/master
[ci skip] fix typo in ActiveRecord::ConnectionHandling
-rw-r--r--activerecord/lib/active_record/connection_handling.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_handling.rb b/activerecord/lib/active_record/connection_handling.rb
index 086c678af5..99fdef67d0 100644
--- a/activerecord/lib/active_record/connection_handling.rb
+++ b/activerecord/lib/active_record/connection_handling.rb
@@ -131,7 +131,7 @@ module ActiveRecord
def remove_connection(name = nil)
name ||= @connection_specification_name if defined?(@connection_specification_name)
- # if removing a connection that have a pool, we reset the
+ # if removing a connection that has a pool, we reset the
# connection_specification_name so it will use the parent
# pool.
if connection_handler.retrieve_connection_pool(name)