From 66e4d26d22c3074c3cc767dead2bad8b9e09a5a6 Mon Sep 17 00:00:00 2001 From: Eric Schultz Date: Fri, 1 Feb 2019 12:58:54 -0600 Subject: [PATCH] Config cleanup --- config/application.rb | 4 +--- config/initializers/devise_async.rb | 2 +- config/initializers/wrap_parameters.rb | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/config/application.rb b/config/application.rb index 4d592adc..91784071 100755 --- a/config/application.rb +++ b/config/application.rb @@ -56,7 +56,7 @@ module Commitchange # This will create an empty whitelist of attributes available for mass-assignment for all models # in your app. As such, your models will need to explicitly whitelist or blacklist accessible # parameters by using an attr_accessible or attr_protected declaration. - config.active_record.whitelist_attributes = true + #config.active_record.whitelist_attributes = true # Enable the asset pipeline config.assets.enabled = true @@ -82,8 +82,6 @@ module Commitchange config.i18n.enforce_available_locales = false - config.active_record.raise_in_transactional_callbacks = true - # Add trailing slashes to all routes # config.action_controller.default_url_options = {:trailing_slash => true} # diff --git a/config/initializers/devise_async.rb b/config/initializers/devise_async.rb index 9d71516a..42d81a4e 100644 --- a/config/initializers/devise_async.rb +++ b/config/initializers/devise_async.rb @@ -1,2 +1,2 @@ # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later -Devise::Async.backend = :delayed_job +#Devise::Async.backend = :delayed_job diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb index ed7b7187..c72a9676 100755 --- a/config/initializers/wrap_parameters.rb +++ b/config/initializers/wrap_parameters.rb @@ -8,7 +8,7 @@ ActiveSupport.on_load(:action_controller) do wrap_parameters format: [:json] end -To enable root element in JSON for ActiveRecord objects. +# To enable root element in JSON for ActiveRecord objects. ActiveSupport.on_load(:active_record) do self.include_root_in_json = true end