aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2012-11-27 02:37:24 -0200
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-11-27 02:37:24 -0200
commit80b8df5f3d09205d8f239e9aefd5ed0e0ddfd4a5 (patch)
tree41381e9d91d9854ef2f484caddf05200d6f003ac
parent462a90565cd9bdecbaaf0b9d9b1ff2f66bebb8f1 (diff)
downloadrails-80b8df5f3d09205d8f239e9aefd5ed0e0ddfd4a5.tar.gz
rails-80b8df5f3d09205d8f239e9aefd5ed0e0ddfd4a5.tar.bz2
rails-80b8df5f3d09205d8f239e9aefd5ed0e0ddfd4a5.zip
Remove warning of circular require
This file was using mime_types before load the Mime::Type class. When trying to register first Mime::Type it load mime_type that loads mime_types in the end. Requiring mime_type ensure that we have the class definition and the mime types
-rw-r--r--actionpack/lib/action_controller/metal/params_wrapper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/params_wrapper.rb b/actionpack/lib/action_controller/metal/params_wrapper.rb
index a475d4bdff..c9f1d8dcb4 100644
--- a/actionpack/lib/action_controller/metal/params_wrapper.rb
+++ b/actionpack/lib/action_controller/metal/params_wrapper.rb
@@ -2,7 +2,7 @@ require 'active_support/core_ext/hash/slice'
require 'active_support/core_ext/hash/except'
require 'active_support/core_ext/module/anonymous'
require 'active_support/core_ext/struct'
-require 'action_dispatch/http/mime_types'
+require 'action_dispatch/http/mime_type'
module ActionController
# Wraps the parameters hash into a nested hash. This will allow clients to submit