update with changes from Production branch

This commit is contained in:
Lee Lawlor
2014-02-17 12:05:39 -05:00
parent 5b640cf9d8
commit a4937fb2e5
384 changed files with 14690 additions and 2242 deletions

View File

@ -6,8 +6,9 @@ Thingspeak::Application.configure do
# since you don't have to restart the webserver when you make code changes.
config.cache_classes = false
# Log error messages when you accidentally call methods on nil.
config.whiny_nils = true
config.eager_load = false
config.assets.prefix = "/dev-assets"
# Show full error reports and disable caching
config.consider_all_requests_local = true
@ -19,20 +20,7 @@ Thingspeak::Application.configure do
# Print deprecation notices to the Rails logger
config.active_support.deprecation = :log
# Only use best-standards-support built into browsers
config.action_dispatch.best_standards_support = :builtin
# Raise exception on mass assignment protection for Active Record models
config.active_record.mass_assignment_sanitizer = :strict
# Log the query plan for queries taking more than this (works
# with SQLite, MySQL, and PostgreSQL)
config.active_record.auto_explain_threshold_in_seconds = 0.5
# Do not compress assets
config.assets.compress = false
# Expands the lines which load the assets
config.assets.debug = true
end

View File

@ -7,8 +7,7 @@ Thingspeak::Application.configure do
# and recreated between test runs. Don't rely on the data there!
config.cache_classes = true
# Log error messages when you accidentally call methods on nil.
config.whiny_nils = true
config.eager_load = false
# Show full error reports and disable caching
config.consider_all_requests_local = true
@ -31,12 +30,8 @@ Thingspeak::Application.configure do
# config.active_record.schema_format = :sql
# Print deprecation notices to the stderr
config.active_support.deprecation = :stderr
# Allow pass debug_assets=true as a query parameter to load pages with unpackaged assets
config.assets.allow_debugging = true
# Configure static asset server for tests with Cache-Control for performance
config.active_support.deprecation = :notify
config.serve_static_assets = true
config.static_cache_control = "public, max-age=3600"
end