diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-04-13 16:36:46 -0500 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-04-13 16:36:46 -0500 |
| commit | ed490b781f9347b77eb2305e33ba6dd83f3539b0 (patch) | |
| tree | 4f958ce8da072e35ef654cf5ae0a152f613f3ad8 /config/environments/test.rb | |
| parent | a817f084eafaf5527445c29ab1d68f42b1a2872f (diff) | |
| parent | 50529cbceb84e611bca497624a7a4c38113e5135 (diff) | |
Merge remote-tracking branch 'origin/master' into gs-master
Conflicts: Gemfile.lock config/application.rb
Diffstat (limited to 'config/environments/test.rb')
| -rw-r--r-- | config/environments/test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/environments/test.rb b/config/environments/test.rb index 122634d5b..1c1891561 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -15,7 +15,7 @@ Rails.application.configure do # Configure public file server for tests with Cache-Control for performance. config.public_file_server.enabled = true config.public_file_server.headers = { - 'Cache-Control' => "public, max-age=#{1.hour.seconds.to_i}" + 'Cache-Control' => "public, max-age=#{1.hour.to_i}" } config.assets.digest = false |