diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2008-12-07 03:27:53 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2008-12-07 03:27:53 +0100 |
| commit | dbbae5e00e49d3a69dc10978e38299e3f28dd1e1 (patch) | |
| tree | 592710207a614428d5cb809f6e13c8b546b58969 /activesupport | |
| parent | 9eca588bdfbb41f6b48477025d1cd8eea4a38296 (diff) | |
| download | rails-dbbae5e00e49d3a69dc10978e38299e3f28dd1e1.tar.gz rails-dbbae5e00e49d3a69dc10978e38299e3f28dd1e1.tar.bz2 rails-dbbae5e00e49d3a69dc10978e38299e3f28dd1e1.zip | |
Merge with docrails
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/buffered_logger.rb | 2 | ||||
| -rw-r--r-- | activesupport/lib/active_support/core_ext/logger.rb | 2 | ||||
| -rw-r--r-- | activesupport/lib/active_support/inflector.rb | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/buffered_logger.rb b/activesupport/lib/active_support/buffered_logger.rb index 77e0b1d33f..b2c863c893 100644 --- a/activesupport/lib/active_support/buffered_logger.rb +++ b/activesupport/lib/active_support/buffered_logger.rb @@ -13,6 +13,8 @@ module ActiveSupport MAX_BUFFER_SIZE = 1000 + ## + # :singleton-method: # Set to false to disable the silencer cattr_accessor :silencer self.silencer = true diff --git a/activesupport/lib/active_support/core_ext/logger.rb b/activesupport/lib/active_support/core_ext/logger.rb index c622554860..24fe7294c9 100644 --- a/activesupport/lib/active_support/core_ext/logger.rb +++ b/activesupport/lib/active_support/core_ext/logger.rb @@ -30,6 +30,8 @@ require 'logger' # # Note: This logger is deprecated in favor of ActiveSupport::BufferedLogger class Logger + ## + # :singleton-method: # Set to false to disable the silencer cattr_accessor :silencer self.silencer = true diff --git a/activesupport/lib/active_support/inflector.rb b/activesupport/lib/active_support/inflector.rb index 683af4556e..4921b99677 100644 --- a/activesupport/lib/active_support/inflector.rb +++ b/activesupport/lib/active_support/inflector.rb @@ -254,7 +254,7 @@ module ActiveSupport # @person = Person.find(1) # # => #<Person id: 1, name: "Donald E. Knuth"> # - # <%= link_to(@person.name, person_path %> + # <%= link_to(@person.name, person_path(@person)) %> # # => <a href="/person/1-donald-e-knuth">Donald E. Knuth</a> def parameterize(string, sep = '-') re_sep = Regexp.escape(sep) |