upgraded rails to 4.2 and dependencies. except rubocop

This commit is contained in:
raluka 2015-11-05 16:07:14 +01:00
parent 28e55f3f50
commit 48db99389e
16 changed files with 407 additions and 293 deletions

View file

@ -8,7 +8,7 @@ Osem::Application.configure do
config.cache_classes = true
# Configure static asset server for tests with Cache-Control for performance
config.serve_static_assets = true
config.serve_static_files = true
config.static_cache_control = 'public, max-age=3600'
# Do not eager load code on boot.
@ -35,6 +35,9 @@ Osem::Application.configure do
# Print deprecation notices to the stderr
config.active_support.deprecation = :stderr
# Randomize/sort the order test cases are executed.
config.active_support.test_order = :sorted # or `:random`
# Set the detault url for action mailer
config.action_mailer.default_url_options = { host: 'localhost:3000' }
@ -47,5 +50,4 @@ Osem::Application.configure do
t = Time.local(2014, 05, 01, 00, 01, 00)
Timecop.travel(t)
end
end