Commit 114d64cc authored by David F.'s avatar David F.
Browse files

Merge branch '15-date_picker-failure' into 'master'

Problème threadsafe

cf. #15 

See merge request !8
parents c8a07eae 4dd5ab6c
......@@ -48,6 +48,9 @@ module OLIGAA
# Version of your assets, change this if you want to expire all your assets
config.assets.version = '1.0'
config.eager_load_paths += ["#{config.root}/lib"]
config.threadsafe!
config.generators do |g|
g.test_framework :rspec,
fixtures: true,
......@@ -59,4 +62,4 @@ module OLIGAA
g.fixture_replacement :factory_girl, dir: "spec/factories"
end
end
end
\ No newline at end of file
end
......@@ -56,6 +56,4 @@ OLIGAA::Application.configure do
# Expands the lines which load the assets
config.assets.debug = true
config.threadsafe!
end
......@@ -73,9 +73,6 @@ OLIGAA::Application.configure do
# Disable delivery errors, bad email addresses will be ignored
# config.action_mailer.raise_delivery_errors = false
# Enable threaded mode
# config.threadsafe!
# Enable locale fallbacks for I18n (makes lookups for any locale fall back to
# the I18n.default_locale when a translation can not be found)
config.i18n.fallbacks = true
......@@ -86,4 +83,4 @@ OLIGAA::Application.configure do
# 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
end
\ No newline at end of file
end
......@@ -56,4 +56,4 @@ OLIGAA::Application.configure do
# Print deprecation notices to the stderr
config.active_support.deprecation = :stderr
end
\ No newline at end of file
end
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment