diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2012-10-05 23:15:11 -0700 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2012-10-05 23:15:11 -0700 |
| commit | 05e9258164658b1fd948311e9d075f5d7a60cbdb (patch) | |
| tree | cce0e6f7b735a1b382a7be352387d028e045c09b /activesupport | |
| parent | 9b496d3147260e9b5bf3993626cf0ebd138ea83a (diff) | |
| parent | 3675cd41f3133ca61b9c5cb13c0cfccab63b2b56 (diff) | |
| download | rails-05e9258164658b1fd948311e9d075f5d7a60cbdb.tar.gz rails-05e9258164658b1fd948311e9d075f5d7a60cbdb.tar.bz2 rails-05e9258164658b1fd948311e9d075f5d7a60cbdb.zip | |
Merge pull request #7862 from frodsan/rename_private_method
rename private method to avoid overriding
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/backtrace_cleaner.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/backtrace_cleaner.rb b/activesupport/lib/active_support/backtrace_cleaner.rb index 47898f8047..f1aff8a8e3 100644 --- a/activesupport/lib/active_support/backtrace_cleaner.rb +++ b/activesupport/lib/active_support/backtrace_cleaner.rb @@ -34,7 +34,7 @@ module ActiveSupport # Returns the backtrace after all filters and silencers have been run # against it. Filters run first, then silencers. def clean(backtrace, kind = :silent) - filtered = filter(backtrace) + filtered = filter_backtrace(backtrace) case kind when :silent @@ -77,7 +77,7 @@ module ActiveSupport end private - def filter(backtrace) + def filter_backtrace(backtrace) @filters.each do |f| backtrace = backtrace.map { |line| f.call(line) } end |