##// END OF EJS Templates
Merged r14155 (#19405)....
Jean-Philippe Lang -
r13823:e2224d4d02ab
parent child
Show More
@@ -59,6 +59,10 module RedmineApp
59 # for more options (same options as config.cache_store).
59 # for more options (same options as config.cache_store).
60 config.redmine_search_cache_store = :memory_store
60 config.redmine_search_cache_store = :memory_store
61
61
62 # Configure log level here so that additional environment file
63 # can change it (environments/ENV.rb would take precedence over it)
64 config.log_level = Rails.env.production? ? :info : :debug
65
62 config.session_store :cookie_store, :key => '_redmine_session'
66 config.session_store :cookie_store, :key => '_redmine_session'
63
67
64 if File.exists?(File.join(File.dirname(__FILE__), 'additional_environment.rb'))
68 if File.exists?(File.join(File.dirname(__FILE__), 'additional_environment.rb'))
@@ -1,8 +1,6
1 Rails.application.configure do
1 Rails.application.configure do
2 # Settings specified here will take precedence over those in config/application.rb
2 # Settings specified here will take precedence over those in config/application.rb
3
3
4 config.log_level = :info
5
6 # Code is not reloaded between requests.
4 # Code is not reloaded between requests.
7 config.cache_classes = true
5 config.cache_classes = true
8
6
General Comments 0
You need to be logged in to leave comments. Login now