diff options
| author | Piotr Sarnacki <drogus@gmail.com> | 2012-09-01 05:33:31 -0700 |
|---|---|---|
| committer | Piotr Sarnacki <drogus@gmail.com> | 2012-09-01 05:33:31 -0700 |
| commit | 2a95a661cfa5f17f9e2176fd80e8c7389b33fbb0 (patch) | |
| tree | d255d82fa056cb77168b771641383655f0b086b8 /actionpack/lib/action_controller/metal | |
| parent | 5f99bdbec2d3ffab416795ac48e350863e0e17d7 (diff) | |
| parent | 3a6e8e464c0d8b77d11fbfcf3d650423b060394c (diff) | |
| download | rails-2a95a661cfa5f17f9e2176fd80e8c7389b33fbb0.tar.gz rails-2a95a661cfa5f17f9e2176fd80e8c7389b33fbb0.tar.bz2 rails-2a95a661cfa5f17f9e2176fd80e8c7389b33fbb0.zip | |
Merge pull request #7494 from route/actionview_decoupling_issue
ActionView decoupling and sprockets-rails tests fail
Diffstat (limited to 'actionpack/lib/action_controller/metal')
| -rw-r--r-- | actionpack/lib/action_controller/metal/asset_paths.rb | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/actionpack/lib/action_controller/metal/asset_paths.rb b/actionpack/lib/action_controller/metal/asset_paths.rb deleted file mode 100644 index 3c1c95c042..0000000000 --- a/actionpack/lib/action_controller/metal/asset_paths.rb +++ /dev/null @@ -1,13 +0,0 @@ -require 'action_controller/metal/exceptions' - -module ActionController - module AssetPaths - extend ActiveSupport::Concern - - include AbstractController::AssetPaths - - def invalid_asset_host!(help_message) - raise ActionController::RoutingError, "This asset host cannot be computed without a request in scope. #{help_message}" - end - end -end |