diff options
| author | Godfrey Chan <godfreykfc@gmail.com> | 2014-12-19 14:16:29 -0800 |
|---|---|---|
| committer | Godfrey Chan <godfreykfc@gmail.com> | 2014-12-19 14:55:34 -0800 |
| commit | 2d04bdd86fb4a9c69e1ca1ffe92188a9ca4f88c8 (patch) | |
| tree | 842f600e072f0ed0b13062a82f36cb7be6129433 /railties/test/application/middleware | |
| parent | 352680c1d394a2177437f20673ede0753d651913 (diff) | |
| download | rails-2d04bdd86fb4a9c69e1ca1ffe92188a9ca4f88c8.tar.gz rails-2d04bdd86fb4a9c69e1ca1ffe92188a9ca4f88c8.tar.bz2 rails-2d04bdd86fb4a9c69e1ca1ffe92188a9ca4f88c8.zip | |
Merge pull request #18100 from chancancode/serve_static_files
Allow static asset serving from env variable (enhanced!)
Conflicts:
railties/CHANGELOG.md
Diffstat (limited to 'railties/test/application/middleware')
| -rw-r--r-- | railties/test/application/middleware/sendfile_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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 |