diff options
| author | wycats <wycats@gmail.com> | 2010-03-28 11:06:46 -0700 |
|---|---|---|
| committer | wycats <wycats@gmail.com> | 2010-03-28 11:06:46 -0700 |
| commit | c99194c7bed6744104e114ab231ef39158044a63 (patch) | |
| tree | 9566ad06335bf96d4c32e421c2d25b4676b3e0d3 /actionpack/lib/action_controller | |
| parent | 835f5d0269a8d3615585119e77f1ba7d601c943b (diff) | |
| parent | f1e5a9ff982998c31c9dedf2fa79180c7dea820a (diff) | |
| download | rails-c99194c7bed6744104e114ab231ef39158044a63.tar.gz rails-c99194c7bed6744104e114ab231ef39158044a63.tar.bz2 rails-c99194c7bed6744104e114ab231ef39158044a63.zip | |
Merge remote branch 'rizwan/restrict'
Diffstat (limited to 'actionpack/lib/action_controller')
4 files changed, 5 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) diff --git a/actionpack/lib/action_controller/railties/log_subscriber.rb b/actionpack/lib/action_controller/railties/log_subscriber.rb index c2299d0b05..00ac3bdf67 100644 --- a/actionpack/lib/action_controller/railties/log_subscriber.rb +++ b/actionpack/lib/action_controller/railties/log_subscriber.rb @@ -1,3 +1,5 @@ +require 'active_support/core_ext/object/blank' + module ActionController module Railties class LogSubscriber < Rails::LogSubscriber diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb index 120f34460e..306db4a431 100644 --- a/actionpack/lib/action_controller/test_case.rb +++ b/actionpack/lib/action_controller/test_case.rb @@ -1,4 +1,5 @@ require 'rack/session/abstract/id' +require 'active_support/core_ext/object/blank' module ActionController module TemplateAssertions |