From f7258370a092897a055636c8a29daa7ec247f984 Mon Sep 17 00:00:00 2001 From: Christoph Haas Date: Mon, 17 Apr 2017 00:16:32 +0200 Subject: [PATCH] Further updates to Rails 5.0.2 --- config/environments/development.rb | 2 ++ config/environments/test.rb | 3 ++- config/initializers/cookies_serializer.rb | 2 +- config/routes.rb | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/config/environments/development.rb b/config/environments/development.rb index 906e235..cb7d3e7 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -76,4 +76,6 @@ Rails.application.configure do large: '800x600', small: '160x120', } + + # config.file_watcher = ActiveSupport::EventedFileUpdateChecker end diff --git a/config/environments/test.rb b/config/environments/test.rb index a7ee23c..58f91c2 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -1,4 +1,4 @@ -Debshots::Application.configure do +Rails.application.configure do # Settings specified here will take precedence over those in config/application.rb. # The test environment is used exclusively to run your application's @@ -28,6 +28,7 @@ Debshots::Application.configure do # Disable request forgery protection in test environment. config.action_controller.allow_forgery_protection = false + config.action_mailer.perform_caching = false # Tell Action Mailer not to deliver emails to the real world. # The :test delivery method accumulates sent emails in the diff --git a/config/initializers/cookies_serializer.rb b/config/initializers/cookies_serializer.rb index 1389e86..5a6a32d 100644 --- a/config/initializers/cookies_serializer.rb +++ b/config/initializers/cookies_serializer.rb @@ -2,4 +2,4 @@ # Specify a serializer for the signed and encrypted cookie jars. # Valid options are :json, :marshal, and :hybrid. -Rails.application.config.action_dispatch.cookies_serializer = :marshal +Rails.application.config.action_dispatch.cookies_serializer = :json diff --git a/config/routes.rb b/config/routes.rb index abb6a74..bd82989 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,4 @@ -Debshots::Application.routes.draw do +Rails.application.routes.draw do get 'admin/status'