diff options
| author | lifo <lifo@null.lan> | 2009-04-17 14:06:26 +0100 |
|---|---|---|
| committer | lifo <lifo@null.lan> | 2009-04-17 14:06:26 +0100 |
| commit | 20401783cf26f903d7020cb7136b1e78e60e71ea (patch) | |
| tree | 5bb029802ade6dda33e051adf74915dc0a8d1fe5 /actionpack/lib/action_controller/deprecated.rb | |
| parent | f99e9f627b6e4ab7fe72bc759426312ec0c7a2cd (diff) | |
| parent | abb899c54e8777428b7a607774370ba29a5573bd (diff) | |
| download | rails-20401783cf26f903d7020cb7136b1e78e60e71ea.tar.gz rails-20401783cf26f903d7020cb7136b1e78e60e71ea.tar.bz2 rails-20401783cf26f903d7020cb7136b1e78e60e71ea.zip | |
Merge commit 'mainstream/master'
Conflicts:
actionpack/lib/action_controller/base.rb
railties/guides/source/caching_with_rails.textile
Diffstat (limited to 'actionpack/lib/action_controller/deprecated.rb')
| -rw-r--r-- | actionpack/lib/action_controller/deprecated.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/deprecated.rb b/actionpack/lib/action_controller/deprecated.rb new file mode 100644 index 0000000000..d98e9ac7bd --- /dev/null +++ b/actionpack/lib/action_controller/deprecated.rb @@ -0,0 +1,2 @@ +ActionController::AbstractRequest = ActionController::Request = ActionDispatch::Request +ActionController::AbstractResponse = ActionController::Response = ActionDispatch::Response |