Merge pull request #731 from mz3944/mz-SCI-1413

Fixed some RoR 5.1 default settings. [SCI-1413]
This commit is contained in:
mz3944 2017-07-06 17:17:27 +02:00 committed by GitHub
commit f55861b373
5 changed files with 7 additions and 9 deletions

View file

@ -19,9 +19,6 @@ module Scinote
config.active_job.queue_adapter = :delayed_job
# Do not swallow errors in after_commit/after_rollback callbacks.
# config.active_record.raise_in_transactional_callbacks = true
# Logging
config.log_formatter = proc do |severity, datetime, progname, msg|
"[#{datetime}] #{severity}: #{msg}\n"

View file

@ -93,8 +93,9 @@ Rails.application.configure do
# routes, locales, etc. This feature depends on the listen gem.
#config.file_watcher = ActiveSupport::EventedFileUpdateChecker
# Suppress logger output for asset requests.
config.assets.quiet = true
# Suppress logger output for asset requests. By default logger output is
# enabled.
# config.assets.quiet = true
# Enable/disable caching. By default caching is disabled.
if Rails.root.join('tmp/caching-dev.txt').exist?

View file

@ -130,8 +130,8 @@ Rails.application.configure do
# config.cache_store = :mem_cache_store
# Use a real queuing backend for Active Job (and separate queues per environment)
# config.active_job.queue_adapter = :resque
# config.active_job.queue_name_prefix = "scinote_#{Rails.env}"
config.active_job.queue_adapter = :delayed_job
config.active_job.queue_name_prefix = "scinote_#{Rails.env}"
config.action_mailer.perform_caching = false
# `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb

View file

@ -7,7 +7,7 @@
# Read the Guide for Upgrading Ruby on Rails for more info on each option.
# Make `form_with` generate non-remote forms.
Rails.application.config.action_view.form_with_generates_remote_forms = false
# Rails.application.config.action_view.form_with_generates_remote_forms = false
# Unknown asset fallback will return the path passed in when the given
# asset is not present in the asset pipeline.

View file

@ -50,7 +50,7 @@ common: &common
# You can use `rake secret` to generate a secure secret key.
# ======================================================================
secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>
# secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>
# ======================================================================
# Write any potential environment-specific secrets here.