diff options
author | Abdelkader Boudih <terminale@gmail.com> | 2015-03-05 07:28:52 +0000 |
---|---|---|
committer | Abdelkader Boudih <terminale@gmail.com> | 2015-03-05 07:28:52 +0000 |
commit | 8266fe3788100a9ebcf1b22cd70a12b49115ce41 (patch) | |
tree | 4af2350cddab10fe50fa7696239d67a30f9eae3d | |
parent | 133f86d80ef43b15146e47fbf0e0ce70014ba448 (diff) | |
parent | 8a5475cb5ffdba9b95d7ae1d2d323540522fc9d6 (diff) | |
download | rails-8266fe3788100a9ebcf1b22cd70a12b49115ce41.tar.gz rails-8266fe3788100a9ebcf1b22cd70a12b49115ce41.tar.bz2 rails-8266fe3788100a9ebcf1b22cd70a12b49115ce41.zip |
Merge pull request #19205 from sivsushruth/doc_fix
Doc fix [ci skip]
-rw-r--r-- | activesupport/lib/active_support/tagged_logging.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/tagged_logging.rb b/activesupport/lib/active_support/tagged_logging.rb index 9086a959aa..bcd7bf74c0 100644 --- a/activesupport/lib/active_support/tagged_logging.rb +++ b/activesupport/lib/active_support/tagged_logging.rb @@ -43,7 +43,7 @@ module ActiveSupport end def current_tags - # We use our object ID here to void conflicting with other instances + # We use our object ID here to avoid conflicting with other instances thread_key = @thread_key ||= "activesupport_tagged_logging_tags:#{object_id}".freeze Thread.current[thread_key] ||= [] end |