From 44840cc85aaadd81b248cbce655155b6d259e596 Mon Sep 17 00:00:00 2001
From: schneems <richard.schneeman@gmail.com>
Date: Tue, 23 Aug 2016 12:20:48 -0500
Subject: Do not deprecate using assets with leading slash
---
actionview/lib/action_view/helpers/asset_url_helper.rb | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
(limited to 'actionview/lib')
diff --git a/actionview/lib/action_view/helpers/asset_url_helper.rb b/actionview/lib/action_view/helpers/asset_url_helper.rb
index 50b13c0271..ba695791b1 100644
--- a/actionview/lib/action_view/helpers/asset_url_helper.rb
+++ b/actionview/lib/action_view/helpers/asset_url_helper.rb
@@ -141,16 +141,11 @@ module ActionView
source = "#{source}#{extname}"
end
- if options[:public_folder]
- source = public_compute_asset_path(source, options) unless options[:raw]
- else
- if source[0] != ?/
- source = compute_asset_path(source, options) unless options[:raw]
- elsif !options[:raw]
- message = "Skipping computing asset path since asset #{ source.inspect } starts with a slash `/`.\n"
- message << "This behavior is deprecated and will be removed. Instead explicitly\n"
- message << "use a `public_*` helper instead. Optionally pass in `raw: true` to get the exact same behavior."
- ActiveSupport::Deprecation.warn(message)
+ if source[0] != ?/
+ if options[:public_folder]
+ source = public_compute_asset_path(source, options)
+ else
+ source = compute_asset_path(source, options)
end
end
--
cgit v1.2.3