diff config/configuration.yml.example @ 1298:4f746d8966dd redmine_2.3_integration

Merge from redmine-2.3 branch to create new branch redmine-2.3-integration

--- a/config/configuration.yml.example	Fri Jun 14 09:07:32 2013 +0100
+++ b/config/configuration.yml.example	Fri Jun 14 09:28:30 2013 +0100
@@ -133,6 +133,12 @@
   scm_bazaar_command:
   scm_darcs_command:
 
+  # Absolute path to the SCM commands errors (stderr) log file.
+  # The default is to log in the 'log' directory of your Redmine instance.
+  # Example:
+  # scm_stderr_log_file: /var/log/redmine_scm_stderr.log
+  scm_stderr_log_file:
+
   # Key used to encrypt sensitive data in the database (SCM and LDAP passwords).
   # If you don't want to enable data encryption, just leave it blank.
   # WARNING: losing/changing this key will make encrypted data unreadable.
@@ -188,6 +194,9 @@
   #
   rmagick_font_path:
 
+  # Maximum number of simultaneous AJAX uploads
+  #max_concurrent_ajax_uploads: 2
+
 # specific configuration options for production environment
 # that overrides the default ones
 production: