diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2010-03-28 11:34:16 -0700 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2010-03-28 11:34:16 -0700 |
commit | 7e3b4c1f2f0c435f1fa5f8f093ce6934d6a1207d (patch) | |
tree | 9e622391ee98e330c96f7e0938120633128f365e /actionpack/lib/action_controller/metal | |
parent | d1f3437cac77673bf00fd95c5a0b7c1676d70603 (diff) | |
parent | c99194c7bed6744104e114ab231ef39158044a63 (diff) | |
download | rails-7e3b4c1f2f0c435f1fa5f8f093ce6934d6a1207d.tar.gz rails-7e3b4c1f2f0c435f1fa5f8f093ce6934d6a1207d.tar.bz2 rails-7e3b4c1f2f0c435f1fa5f8f093ce6934d6a1207d.zip |
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'actionpack/lib/action_controller/metal')
-rw-r--r-- | actionpack/lib/action_controller/metal/http_authentication.rb | 1 | ||||
-rw-r--r-- | actionpack/lib/action_controller/metal/renderers.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/metal/http_authentication.rb b/actionpack/lib/action_controller/metal/http_authentication.rb index 6ec788f302..424828f7e8 100644 --- a/actionpack/lib/action_controller/metal/http_authentication.rb +++ b/actionpack/lib/action_controller/metal/http_authentication.rb @@ -1,4 +1,5 @@ require 'active_support/base64' +require 'active_support/core_ext/object/blank' module ActionController module HttpAuthentication diff --git a/actionpack/lib/action_controller/metal/renderers.rb b/actionpack/lib/action_controller/metal/renderers.rb index d906e1fb5b..aebd71e867 100644 --- a/actionpack/lib/action_controller/metal/renderers.rb +++ b/actionpack/lib/action_controller/metal/renderers.rb @@ -1,4 +1,5 @@ require 'active_support/core_ext/class/attribute' +require 'active_support/core_ext/object/blank' module ActionController def self.add_renderer(key, &block) |