diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-04-06 03:53:23 -0700 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-04-06 03:53:23 -0700 |
| commit | 1d95c566fb87b5c578b9d1701e0b8f8fc8d463a4 (patch) | |
| tree | 0805419f752fa21b33b20892618630f2221f29be /railties | |
| parent | dfdc1e31a2d86a54b9aceac1869318cc921150ef (diff) | |
| parent | 74d09060a3396a9ed11dbf7f776be663326375d1 (diff) | |
| download | rails-1d95c566fb87b5c578b9d1701e0b8f8fc8d463a4.tar.gz rails-1d95c566fb87b5c578b9d1701e0b8f8fc8d463a4.tar.bz2 rails-1d95c566fb87b5c578b9d1701e0b8f8fc8d463a4.zip | |
Merge pull request #10118 from vipulnsward/remove_unused_var_task
remove unused variables
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/engine.rb | 2 | ||||
| -rw-r--r-- | railties/lib/rails/test_unit/testing.rake | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb index 93504b3b35..86f62dfb40 100644 --- a/railties/lib/rails/engine.rb +++ b/railties/lib/rails/engine.rb @@ -553,7 +553,7 @@ module Rails # # This needs to be an initializer, since it needs to run once # per engine and get the engine as a block parameter - initializer :set_autoload_paths, before: :bootstrap_hook do |app| + initializer :set_autoload_paths, before: :bootstrap_hook do ActiveSupport::Dependencies.autoload_paths.unshift(*_all_autoload_paths) ActiveSupport::Dependencies.autoload_once_paths.unshift(*_all_autoload_once_paths) diff --git a/railties/lib/rails/test_unit/testing.rake b/railties/lib/rails/test_unit/testing.rake index 9a3094b1b7..877dd6d254 100644 --- a/railties/lib/rails/test_unit/testing.rake +++ b/railties/lib/rails/test_unit/testing.rake @@ -82,7 +82,6 @@ namespace :test do # Display deprecation message task :deprecated do - task_name = ARGV.first ActiveSupport::Deprecation.warn "`rake #{ARGV.first}` is deprecated with no replacement." end |