diff options
| author | Joshua Peek <josh@joshpeek.com> | 2009-12-20 20:05:26 -0600 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2009-12-20 20:05:26 -0600 |
| commit | 29c8a43056f40759a8c64cbcbd4e71d4283b233d (patch) | |
| tree | e5797a3fbcd299c10ec788eb3bedd9801128a096 /actionpack/lib/action_controller/metal | |
| parent | 0f8a5c7954bfc134f46eeb72c4cc8744825cbb5a (diff) | |
| download | rails-29c8a43056f40759a8c64cbcbd4e71d4283b233d.tar.gz rails-29c8a43056f40759a8c64cbcbd4e71d4283b233d.tar.bz2 rails-29c8a43056f40759a8c64cbcbd4e71d4283b233d.zip | |
Rename RackConvenience => RackDelegation
Diffstat (limited to 'actionpack/lib/action_controller/metal')
| -rw-r--r-- | actionpack/lib/action_controller/metal/conditional_get.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/metal/cookies.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/metal/rack_delegation.rb (renamed from actionpack/lib/action_controller/metal/rack_convenience.rb) | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/metal/testing.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/metal/url_for.rb | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/actionpack/lib/action_controller/metal/conditional_get.rb b/actionpack/lib/action_controller/metal/conditional_get.rb index 5156fbc1d5..61e7ece90d 100644 --- a/actionpack/lib/action_controller/metal/conditional_get.rb +++ b/actionpack/lib/action_controller/metal/conditional_get.rb @@ -2,7 +2,7 @@ module ActionController module ConditionalGet extend ActiveSupport::Concern - include RackConvenience + include RackDelegation include Head # Sets the etag, last_modified, or both on the response and renders a diff --git a/actionpack/lib/action_controller/metal/cookies.rb b/actionpack/lib/action_controller/metal/cookies.rb index 6855ca1478..e27374e4c4 100644 --- a/actionpack/lib/action_controller/metal/cookies.rb +++ b/actionpack/lib/action_controller/metal/cookies.rb @@ -46,7 +46,7 @@ module ActionController #:nodoc: module Cookies extend ActiveSupport::Concern - include RackConvenience + include RackDelegation included do helper_method :cookies diff --git a/actionpack/lib/action_controller/metal/rack_convenience.rb b/actionpack/lib/action_controller/metal/rack_delegation.rb index f0837c10e8..5141918499 100644 --- a/actionpack/lib/action_controller/metal/rack_convenience.rb +++ b/actionpack/lib/action_controller/metal/rack_delegation.rb @@ -1,5 +1,5 @@ module ActionController - module RackConvenience + module RackDelegation extend ActiveSupport::Concern included do diff --git a/actionpack/lib/action_controller/metal/testing.rb b/actionpack/lib/action_controller/metal/testing.rb index a4a1116d9e..c193a5eff4 100644 --- a/actionpack/lib/action_controller/metal/testing.rb +++ b/actionpack/lib/action_controller/metal/testing.rb @@ -2,7 +2,7 @@ module ActionController module Testing extend ActiveSupport::Concern - include RackConvenience + include RackDelegation # OMG MEGA HAX def process_with_new_base_test(request, response) diff --git a/actionpack/lib/action_controller/metal/url_for.rb b/actionpack/lib/action_controller/metal/url_for.rb index 14c6523045..8c3810ebcb 100644 --- a/actionpack/lib/action_controller/metal/url_for.rb +++ b/actionpack/lib/action_controller/metal/url_for.rb @@ -2,7 +2,7 @@ module ActionController module UrlFor extend ActiveSupport::Concern - include RackConvenience + include RackDelegation # Overwrite to implement a number of default options that all url_for-based methods will use. The default options should come in # the form of a hash, just like the one you would use for url_for directly. Example: |