From 8accda251e98bdbb90d7571b31c869aae5c80980 Mon Sep 17 00:00:00 2001 From: Thorsten Eckel Date: Sun, 12 Oct 2014 14:45:14 +0200 Subject: [PATCH] Improved comments and formatting. --- config/environments/production.rb | 18 +++++++++--------- config/environments/test.rb | 11 ++++++++--- config/environments/test_mysql.rb | 11 ++++++++--- 3 files changed, 25 insertions(+), 15 deletions(-) diff --git a/config/environments/production.rb b/config/environments/production.rb index e57a56520..a07e81ebd 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -20,8 +20,8 @@ Zammad::Application.configure do # Compress JavaScripts and CSS config.assets.compress = true - # Compress JavaScripts and CSS. - config.assets.js_compressor = :uglifier + # Set uglifier as JS and sass as CSS compressor + config.assets.js_compressor = :uglifier # config.assets.css_compressor = :sass # Don't fallback to assets pipeline if a precompiled asset is missed @@ -30,17 +30,17 @@ Zammad::Application.configure do # Generate digests for assets URLs config.assets.digest = true - # Version of your assets, change this if you want to expire all your assets. + # Version of your assets, change this if you want to expire all your assets config.assets.version = '1.0' # Specifies the header that your server uses for sending files - # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache + # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx - # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. + # 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) + # Define the log level (default is :info, to see all use :debug) # config.log_level = :debug config.log_level = :info @@ -69,12 +69,12 @@ Zammad::Application.configure do # Send deprecation notices to registered listeners config.active_support.deprecation = :notify - # Disable automatic flushing of the log to improve performance. + # Disable automatic flushing of the log to improve performance # config.autoflush_log = false - # autoload on + # Enable autoload config.dependency_loading = true - # Use default logging formatter so that PID and timestamp are not suppressed. + # Use default logging formatter so that PID and timestamp are not suppressed config.log_formatter = ::Logger::Formatter.new end diff --git a/config/environments/test.rb b/config/environments/test.rb index 970488c3b..8c8d17be4 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -13,11 +13,16 @@ Zammad::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_assets = true config.static_cache_control = "public, max-age=3600" + # Disable assert compression for relyable error code lines config.assets.compress = false + + # Don't fallback to assets pipeline if a precompiled asset is missed config.assets.compile = true + + # Generate digests for assets URLs config.assets.digest = true # Show full error reports and disable caching @@ -36,9 +41,9 @@ Zammad::Application.configure do config.active_support.deprecation = :stderr # Disable request forgery protection in test environment - config.action_controller.allow_forgery_protection = false + config.action_controller.allow_forgery_protection = false - # autoload on + # Enable autoload config.dependency_loading = true end diff --git a/config/environments/test_mysql.rb b/config/environments/test_mysql.rb index 37bab79d2..b3ae7c547 100644 --- a/config/environments/test_mysql.rb +++ b/config/environments/test_mysql.rb @@ -8,11 +8,16 @@ Zammad::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_assets = true config.static_cache_control = "public, max-age=3600" + # Disable assert compression for relyable error code lines config.assets.compress = false + + # Don't fallback to assets pipeline if a precompiled asset is missed config.assets.compile = true + + # Generate digests for assets URLs config.assets.digest = true # Show full error reports and disable caching @@ -31,9 +36,9 @@ Zammad::Application.configure do config.active_support.deprecation = :stderr # Disable request forgery protection in test environment - config.action_controller.allow_forgery_protection = false + config.action_controller.allow_forgery_protection = false - # autoload on + # Enable autoload config.dependency_loading = true end