# HG changeset patch
# User Marcin Kuzminski <marcin@rhodecode.com>
# Date 2016-06-24 11:32:59
# Node ID e3a9bf52ff4f3b577c50abc3649122c19614bae9
# Parent  a831f9d8ccccd1e98dca38e2cd746a440b351a68

config: synced .ini files with latest changes

diff --git a/configs/development.ini b/configs/development.ini
--- a/configs/development.ini
+++ b/configs/development.ini
@@ -114,6 +114,11 @@ rhodecode.api.url = /_admin/api
 
 ## END RHODECODE PLUGINS ##
 
+## encryption key used to encrypt social plugin tokens,
+## remote_urls with credentials etc, if not set it defaults to
+## `beaker.session.secret`
+#rhodecode.encrypted_values.secret =
+
 full_stack = true
 
 ## Serve static files via RhodeCode, disable to serve them via HTTP server
diff --git a/configs/production.ini b/configs/production.ini
--- a/configs/production.ini
+++ b/configs/production.ini
@@ -88,11 +88,19 @@ use = egg:rhodecode-enterprise-ce
 ## enable proxy prefix middleware, defined below
 #filter-with = proxy-prefix
 
+## encryption key used to encrypt social plugin tokens,
+## remote_urls with credentials etc, if not set it defaults to
+## `beaker.session.secret`
+#rhodecode.encrypted_values.secret =
+
 full_stack = true
 
 ## Serve static files via RhodeCode, disable to serve them via HTTP server
 static_files = true
 
+# autogenerate javascript routes file on startup
+generate_js_files = false
+
 ## Optional Languages
 ## en(default), be, de, es, fr, it, ja, pl, pt, ru, zh
 lang = en
@@ -353,7 +361,6 @@ beaker.session.auto = false
 search.module = rhodecode.lib.index.whoosh
 search.location = %(here)s/data/index
 
-
 ###################################
 ##       APPENLIGHT CONFIG       ##
 ###################################