diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2015-04-25 07:34:25 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2015-04-25 07:34:25 +0000 |
| commit | e2224d4d02abffefb787b2ed1e895b4a56daac06 (patch) | |
| tree | fe3731e06e18aa3872b7bdf7b48d455cb6c1bd1c | |
| parent | d60a78fe2307d2e7a026c7c52471e0cdd7c757e3 (diff) | |
| download | redmine-e2224d4d02abffefb787b2ed1e895b4a56daac06.tar.gz redmine-e2224d4d02abffefb787b2ed1e895b4a56daac06.zip | |
Merged r14155 (#19405).
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14205 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | config/application.rb | 4 | ||||
| -rw-r--r-- | config/environments/production.rb | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/config/application.rb b/config/application.rb index 906b06785..0f75247c1 100644 --- a/config/application.rb +++ b/config/application.rb @@ -59,6 +59,10 @@ module RedmineApp # for more options (same options as config.cache_store). config.redmine_search_cache_store = :memory_store + # Configure log level here so that additional environment file + # can change it (environments/ENV.rb would take precedence over it) + config.log_level = Rails.env.production? ? :info : :debug + config.session_store :cookie_store, :key => '_redmine_session' if File.exists?(File.join(File.dirname(__FILE__), 'additional_environment.rb')) diff --git a/config/environments/production.rb b/config/environments/production.rb index 59e7a3757..85cd3890c 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -1,8 +1,6 @@ Rails.application.configure do # Settings specified here will take precedence over those in config/application.rb - config.log_level = :info - # Code is not reloaded between requests. config.cache_classes = true |