aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--actionpack/lib/action_controller.rb2
-rw-r--r--actionpack/lib/action_controller/base/mime_responds.rb (renamed from actionpack/lib/action_controller/mime/responds.rb)0
2 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb
index e52690ebf6..100a0be1db 100644
--- a/actionpack/lib/action_controller.rb
+++ b/actionpack/lib/action_controller.rb
@@ -53,7 +53,7 @@ module ActionController
autoload :Integration, 'action_controller/testing/integration'
autoload :IntegrationTest, 'action_controller/testing/integration'
autoload :Layout, 'action_controller/base/layout'
- autoload :MimeResponds, 'action_controller/mime/responds'
+ autoload :MimeResponds, 'action_controller/base/mime_responds'
autoload :PolymorphicRoutes, 'action_controller/routing/generation/polymorphic_routes'
autoload :RecordIdentifier, 'action_controller/record_identifier'
autoload :Redirector, 'action_controller/base/redirect'
diff --git a/actionpack/lib/action_controller/mime/responds.rb b/actionpack/lib/action_controller/base/mime_responds.rb
index bac225ab2a..bac225ab2a 100644
--- a/actionpack/lib/action_controller/mime/responds.rb
+++ b/actionpack/lib/action_controller/base/mime_responds.rb