diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2009-07-03 13:01:39 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-07-03 13:01:39 +0100 |
| commit | 2fe263bb328c20539f2970057f31e567ec4ab7c8 (patch) | |
| tree | 63e85164fb09aca6beb78e1a5c52424fa49ed098 /activeresource/examples | |
| parent | bf5ac9965f12840d469ef2a4a16e8205dbbe5253 (diff) | |
| parent | a4bdc00fec623f72592e663e6d7830eea0bc6ea4 (diff) | |
| download | rails-2fe263bb328c20539f2970057f31e567ec4ab7c8.tar.gz rails-2fe263bb328c20539f2970057f31e567ec4ab7c8.tar.bz2 rails-2fe263bb328c20539f2970057f31e567ec4ab7c8.zip | |
Merge commit 'mainstream/master'
Conflicts:
actionpack/lib/action_controller.rb
actionpack/lib/action_controller/base/base.rb
actionpack/lib/action_view/template/path.rb
activesupport/lib/active_support/json/encoders/hash.rb
Diffstat (limited to 'activeresource/examples')
| -rw-r--r-- | activeresource/examples/simple.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/activeresource/examples/simple.rb b/activeresource/examples/simple.rb index b20ef61670..6d2c6e3b1b 100644 --- a/activeresource/examples/simple.rb +++ b/activeresource/examples/simple.rb @@ -1,6 +1,5 @@ $LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../lib" require 'active_resource' -require 'active_resource/http_mock' require 'active_support/core_ext/hash/conversions' ActiveSupport::XmlMini.backend = ENV['XMLMINI'] || 'REXML' |