Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor AssetUrlHelper #7927

Merged
merged 16 commits into from Oct 15, 2012
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion actionmailer/lib/action_mailer/railtie.rb
Expand Up @@ -22,7 +22,6 @@ class Railtie < Rails::Railtie # :nodoc:
options.queue ||= app.queue

# make sure readers methods get compiled
options.asset_path ||= app.config.asset_path
options.asset_host ||= app.config.asset_host
options.relative_url_root ||= app.config.relative_url_root

Expand Down
2 changes: 1 addition & 1 deletion actionpack/lib/abstract_controller/asset_paths.rb
Expand Up @@ -3,7 +3,7 @@ module AssetPaths #:nodoc:
extend ActiveSupport::Concern

included do
config_accessor :asset_host, :asset_path, :assets_dir, :javascripts_dir,
config_accessor :asset_host, :assets_dir, :javascripts_dir,
:stylesheets_dir, :default_asset_host_protocol, :relative_url_root
end
end
Expand Down
1 change: 0 additions & 1 deletion actionpack/lib/action_controller/railtie.rb
Expand Up @@ -34,7 +34,6 @@ class Railtie < Rails::Railtie #:nodoc:
options.stylesheets_dir ||= paths["public/stylesheets"].first

# Ensure readers methods get compiled
options.asset_path ||= app.config.asset_path
options.asset_host ||= app.config.asset_host
options.relative_url_root ||= app.config.relative_url_root

Expand Down
1 change: 0 additions & 1 deletion actionpack/lib/action_view.rb
Expand Up @@ -29,7 +29,6 @@ module ActionView
extend ActiveSupport::Autoload

eager_autoload do
autoload :AssetPaths
autoload :Base
autoload :Context
autoload :CompiledTemplates, "action_view/context"
Expand Down
143 changes: 0 additions & 143 deletions actionpack/lib/action_view/asset_paths.rb

This file was deleted.

This file was deleted.