upgraded rails to 4.2 and dependencies. except rubocop

config/environments/production.rb

@@ -15,7 +15,7 @@ Osem::Application.configure do
   config.eager_load = true
 
   # Disable Rails's static asset server (Apache or nginx will already do this)
-  config.serve_static_assets = false
+  config.serve_static_files = false
   # Compress JavaScripts and CSS
   config.assets.compress = true
 
@@ -35,8 +35,9 @@ Osem::Application.configure do
   # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
   # config.force_ssl = true
 
-  # See everything in the log (default is :info)
-  # config.log_level = :debug
+  # See everything in the log. Set to `:info` to match the current default, or set to `:debug` to opt-into
+  # the future default.
+  config.log_level = :info
 
   # Prepend all log lines with the following tags
   # config.log_tags = [ :subdomain, :uuid ]

config/environments/test.rb

@@ -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