diff options
| author | Carl Lerche <carllerche@mac.com> | 2010-04-18 13:02:37 -0700 |
|---|---|---|
| committer | Carl Lerche <carllerche@mac.com> | 2010-04-18 13:02:37 -0700 |
| commit | d32a4cbaa5174cc1a73d41a73f55145251c18c84 (patch) | |
| tree | 16e3ad82102aa6d290b8941dd69e27b1efaf14f6 /actionpack/test/controller/mime_responds_test.rb | |
| parent | c16c248912e4ae3b6a64e6acdbf1a1e0dd2feb26 (diff) | |
| parent | 8c7e8976e97d96f514e22b04fc1afb9453134076 (diff) | |
| download | rails-d32a4cbaa5174cc1a73d41a73f55145251c18c84.tar.gz rails-d32a4cbaa5174cc1a73d41a73f55145251c18c84.tar.bz2 rails-d32a4cbaa5174cc1a73d41a73f55145251c18c84.zip | |
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'actionpack/test/controller/mime_responds_test.rb')
| -rw-r--r-- | actionpack/test/controller/mime_responds_test.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/test/controller/mime_responds_test.rb b/actionpack/test/controller/mime_responds_test.rb index 53cd3f0801..c8ba8bcaf3 100644 --- a/actionpack/test/controller/mime_responds_test.rb +++ b/actionpack/test/controller/mime_responds_test.rb @@ -1,5 +1,6 @@ require 'abstract_unit' require 'controller/fake_models' +require 'active_support/core_ext/hash/conversions' class RespondToController < ActionController::Base layout :set_layout |