aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--actionpack/lib/sprockets/assets.rake1
-rw-r--r--railties/CHANGELOG3
-rw-r--r--railties/test/application/assets_test.rb2
3 files changed, 0 insertions, 6 deletions
diff --git a/actionpack/lib/sprockets/assets.rake b/actionpack/lib/sprockets/assets.rake
index ee8ca1b3dd..0531b1509b 100644
--- a/actionpack/lib/sprockets/assets.rake
+++ b/actionpack/lib/sprockets/assets.rake
@@ -43,7 +43,6 @@ namespace :assets do
mkdir_p filename.dirname
asset.write_to(filename)
asset.write_to("#{filename}.gz") if filename.to_s =~ /\.(css|js)$/
- asset.write_to(target.join(logical_path))
end
end
end
diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index 9ba93d6130..6ed76974b4 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -12,9 +12,6 @@
*Rails 3.1.0 (unreleased)*
-* Provide a way to access to assets without using the digest, useful for
-static files and emails. [Santiago Pastorino]
-
* The default database schema file is written as UTF-8. [Aaron Patterson]
* Generated apps with --dev or --edge flags depend on git versions of
diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb
index 9b141ccbac..959914bcea 100644
--- a/railties/test/application/assets_test.rb
+++ b/railties/test/application/assets_test.rb
@@ -58,9 +58,7 @@ module ApplicationTests
Dir.chdir(app_path){ `bundle exec rake assets:precompile` }
end
files = Dir["#{app_path}/public/assets/application-*.js"]
- files << Dir["#{app_path}/public/assets/application.js"].first
files << Dir["#{app_path}/public/assets/foo/application-*.js"].first
- files << Dir["#{app_path}/public/assets/foo/application.js"].first
files.each do |file|
assert_not_nil file, "Expected application.js asset to be generated, but none found"
assert_equal "alert()", File.read(file)