Merge branch 'develop' into szzh
This commit is contained in:
commit
ead0ffb2f4
|
@ -11,7 +11,7 @@ RedmineApp::Application.configure do
|
|||
# Show full error reports and disable caching
|
||||
config.consider_all_requests_local = true
|
||||
config.action_controller.perform_caching = false
|
||||
config.cache_store = :file_store, "#{Rails.root }/public/tmp/"
|
||||
config.cache_store = :file_store, "#{Rails.root }/files/cache_store/"
|
||||
# Don't care if the mailer can't send
|
||||
config.action_mailer.raise_delivery_errors = true
|
||||
|
||||
|
|
|
@ -19,7 +19,7 @@ RedmineApp::Application.configure do
|
|||
# Full error reports are disabled and caching is turned on
|
||||
config.logger = Logger.new('log/production.log', 'daily',1048576) # daily, weekly or monthly
|
||||
config.action_controller.perform_caching = true
|
||||
config.cache_store = :file_store, "#{Rails.root }/public/tmp/"
|
||||
config.cache_store = :file_store, "#{Rails.root }/files/cache_store/"
|
||||
# Enable serving of images, stylesheets, and javascripts from an asset server
|
||||
# config.action_controller.asset_host = "http://assets.example.com"
|
||||
|
||||
|
|
|
@ -1 +1 @@
|
|||
Rails.application.config.session_store ActionDispatch::Session::CacheStore, :expire_after => 20.minutes
|
||||
Rails.application.config.session_store ActionDispatch::Session::CacheStore, :expire_after => 20.minutes, :key => '_trustie_session', :domain => :all
|
||||
|
|
Loading…
Reference in New Issue