mirror of
https://github.com/heartcombo/devise.git
synced 2022-11-09 12:18:31 -05:00
Merge pull request #3394 from JuanitoFatas/patch/fix-warning
Suppress test.rb configuration warning for Rails 4.2.
This commit is contained in:
commit
7946f681a9
1 changed files with 7 additions and 2 deletions
|
@ -12,8 +12,13 @@ RailsApp::Application.configure do
|
||||||
# preloads Rails for running tests, you may have to set it to true.
|
# preloads Rails for running tests, you may have to set it to true.
|
||||||
config.eager_load = false
|
config.eager_load = false
|
||||||
|
|
||||||
# Configure static asset server for tests with Cache-Control for performance.
|
# Disable serving static files from the `/public` folder by default since
|
||||||
config.serve_static_assets = true
|
# Apache or NGINX already handles this.
|
||||||
|
if Rails.version >= "4.2.0"
|
||||||
|
config.serve_static_files = true
|
||||||
|
else
|
||||||
|
config.serve_static_assets = true
|
||||||
|
end
|
||||||
config.static_cache_control = "public, max-age=3600"
|
config.static_cache_control = "public, max-age=3600"
|
||||||
|
|
||||||
# Show full error reports and disable caching.
|
# Show full error reports and disable caching.
|
||||||
|
|
Loading…
Add table
Reference in a new issue