From 754953a653e1f2f5307e6d4f3a1d27d97a9e3176 Mon Sep 17 00:00:00 2001 From: Christoph Haas Date: Thu, 23 Apr 2015 17:18:55 +0200 Subject: [PATCH] Remove Rails 4 compatibility cruft. --- config/environments/production.rb | 4 +++- config/environments/test.rb | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/config/environments/production.rb b/config/environments/production.rb index 1743d4f..a5f1794 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -10,6 +10,9 @@ Debshots::Application.configure do # Rake tasks automatically ignore this option for performance. config.eager_load = true + # ActiveRecord errors propagate normally (forward deprecation to Rails 5) + config.active_record.raise_in_transactional_callbacks = true + # Full error reports are disabled and caching is turned on. config.consider_all_requests_local = false config.action_controller.perform_caching = true @@ -20,7 +23,6 @@ Debshots::Application.configure do # config.action_dispatch.rack_cache = true # Disable Rails's static asset server (Apache or nginx will already do this). - # config.serve_static_assets = false config.serve_static_files = true # Compress JavaScripts and CSS. diff --git a/config/environments/test.rb b/config/environments/test.rb index bf7a212..ee99f2f 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -13,7 +13,7 @@ Debshots::Application.configure do config.eager_load = false # 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" # Show full error reports and disable caching.