From 2d04bdd86fb4a9c69e1ca1ffe92188a9ca4f88c8 Mon Sep 17 00:00:00 2001 From: Godfrey Chan Date: Fri, 19 Dec 2014 14:16:29 -0800 Subject: Merge pull request #18100 from chancancode/serve_static_files Allow static asset serving from env variable (enhanced!) Conflicts: railties/CHANGELOG.md --- railties/test/application/middleware/sendfile_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'railties/test/application/middleware') diff --git a/railties/test/application/middleware/sendfile_test.rb b/railties/test/application/middleware/sendfile_test.rb index eb791f5687..dc96480d6d 100644 --- a/railties/test/application/middleware/sendfile_test.rb +++ b/railties/test/application/middleware/sendfile_test.rb @@ -61,7 +61,7 @@ module ApplicationTests test "files handled by ActionDispatch::Static are handled by Rack::Sendfile" do make_basic_app do |app| app.config.action_dispatch.x_sendfile_header = 'X-Sendfile' - app.config.serve_static_assets = true + app.config.serve_static_files = true app.paths["public"] = File.join(rails_root, "public") end -- cgit v1.2.3