diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-04-08 22:28:52 -0700 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-04-08 22:28:52 -0700 |
| commit | 817e8fad5a84569729ae65fbd713274678c68d8f (patch) | |
| tree | 0959695c4648b967a300ad38f8b22d0d9c62226b | |
| parent | fb6c661fe946dc899b15d15b92cc8cf9a21d424e (diff) | |
| parent | f6fd38f1eaa94f0a3dfec53c66814b38ba7694e4 (diff) | |
| download | rails-817e8fad5a84569729ae65fbd713274678c68d8f.tar.gz rails-817e8fad5a84569729ae65fbd713274678c68d8f.tar.bz2 rails-817e8fad5a84569729ae65fbd713274678c68d8f.zip | |
Merge pull request #10147 from vipulnsward/fix_AP_live_warning
fix AP warning; remove unused variable
| -rw-r--r-- | actionpack/lib/action_controller/metal/live.rb | 1 | ||||
| -rw-r--r-- | activerecord/lib/active_record/railties/databases.rake | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/live.rb b/actionpack/lib/action_controller/metal/live.rb index 0a77352e57..47a66fc194 100644 --- a/actionpack/lib/action_controller/metal/live.rb +++ b/actionpack/lib/action_controller/metal/live.rb @@ -34,6 +34,7 @@ module ActionController module Live class Buffer < ActionDispatch::Response::Buffer #:nodoc: def initialize(response) + @error_callback = nil super(response, SizedQueue.new(10)) end diff --git a/activerecord/lib/active_record/railties/databases.rake b/activerecord/lib/active_record/railties/databases.rake index 93bbeea5a3..48febcbc43 100644 --- a/activerecord/lib/active_record/railties/databases.rake +++ b/activerecord/lib/active_record/railties/databases.rake @@ -373,7 +373,7 @@ namespace :railties do puts "NOTE: Migration #{migration.basename} from #{name} has been skipped. Migration with the same name already exists." end - on_copy = Proc.new do |name, migration, old_path| + on_copy = Proc.new do |name, migration| puts "Copied migration #{migration.basename} from #{name}" end |