Remove --http.

rails · Mar 14, 2012 · 6db930cb5bbff9ad824590b5844e04768de240b1 · 6db930c · jashkenas · Mar 14, 2012
1 parent 1efeb07
commit 6db930cb5bbff9ad824590b5844e04768de240b1
Show file tree

Hide file tree

Showing 30 changed files with 7 additions and 1,020 deletions.
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
@@ -1,7 +1,5 @@
 ## Rails 4.0.0 (unreleased) ##
 
-*   Support API apps http://edgeguides.rubyonrails.org/api_app.html *Santiago Pastorino and Carlos Antonio da Silva*
-
 *   Add `include_hidden` option to select tag. With `:include_hidden => false` select with `multiple` attribute doesn't generate hidden input with blank value. *Vasiliy Ermolovich*
 
 *   Removed default `size` option from the `text_field`, `search_field`, `telephone_field`, `url_field`, `email_field` helpers. *Philip Arndt*

diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb
@@ -6,7 +6,6 @@ module ActionController
 
   autoload :Base
   autoload :Caching
-  autoload :HTTP
   autoload :Metal
   autoload :Middleware
 

diff --git a/actionpack/lib/action_controller/http.rb b/actionpack/lib/action_controller/http.rb
diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
@@ -293,10 +293,6 @@ def self.test_routes(&block)
     end
   end
 
-  class HTTP
-    include SharedTestRoutes.url_helpers
-  end
-
   class TestCase
     include ActionDispatch::TestProcess
 

diff --git a/actionpack/test/controller/http/action_methods_test.rb b/actionpack/test/controller/http/action_methods_test.rb
diff --git a/actionpack/test/controller/http/conditional_get_test.rb b/actionpack/test/controller/http/conditional_get_test.rb
diff --git a/actionpack/test/controller/http/data_streaming_test.rb b/actionpack/test/controller/http/data_streaming_test.rb
diff --git a/actionpack/test/controller/http/force_ssl_test.rb b/actionpack/test/controller/http/force_ssl_test.rb
diff --git a/actionpack/test/controller/http/redirect_to_test.rb b/actionpack/test/controller/http/redirect_to_test.rb
diff --git a/actionpack/test/controller/http/renderers_test.rb b/actionpack/test/controller/http/renderers_test.rb
diff --git a/actionpack/test/controller/http/url_for_test.rb b/actionpack/test/controller/http/url_for_test.rb