aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/dependencies.rb
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2012-08-20 23:58:08 +0200
committerXavier Noria <fxn@hashref.com>2012-08-20 23:59:36 +0200
commitf298481b36d600dab032f7b77323354dea469ec0 (patch)
tree87bb77162075e18b1b6a3872ee884844c6609cbf /activesupport/lib/active_support/dependencies.rb
parentbf3fa34ed0aa33bca3aac9c96165662fe864a7b4 (diff)
downloadrails-f298481b36d600dab032f7b77323354dea469ec0.tar.gz
rails-f298481b36d600dab032f7b77323354dea469ec0.tar.bz2
rails-f298481b36d600dab032f7b77323354dea469ec0.zip
Revert "removes unused optional argument in AS::Dependencies::Loadable#load"
This argument is there because that's the signature of Kernel#load. This reverts commit bf3fa34ed0aa33bca3aac9c96165662fe864a7b4.
Diffstat (limited to 'activesupport/lib/active_support/dependencies.rb')
-rw-r--r--activesupport/lib/active_support/dependencies.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/dependencies.rb b/activesupport/lib/active_support/dependencies.rb
index 4e74897d5d..77cab6f08d 100644
--- a/activesupport/lib/active_support/dependencies.rb
+++ b/activesupport/lib/active_support/dependencies.rb
@@ -246,7 +246,7 @@ module ActiveSupport #:nodoc:
raise
end
- def load(file)
+ def load(file, wrap = false)
result = false
load_dependency(file) { result = super }
result