aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
Diffstat (limited to 'railties')
-rw-r--r--railties/configs/databases/mysql.yml3
-rw-r--r--railties/html/index.html1
2 files changed, 4 insertions, 0 deletions
diff --git a/railties/configs/databases/mysql.yml b/railties/configs/databases/mysql.yml
index a4406e4923..1a14bfb332 100644
--- a/railties/configs/databases/mysql.yml
+++ b/railties/configs/databases/mysql.yml
@@ -17,6 +17,7 @@
development:
adapter: mysql
encoding: utf8
+ reconnect: false
database: <%= app_name %>_development
pool: 5
username: root
@@ -33,6 +34,7 @@ development:
test:
adapter: mysql
encoding: utf8
+ reconnect: false
database: <%= app_name %>_test
pool: 5
username: root
@@ -46,6 +48,7 @@ test:
production:
adapter: mysql
encoding: utf8
+ reconnect: false
database: <%= app_name %>_production
pool: 5
username: root
diff --git a/railties/html/index.html b/railties/html/index.html
index e84c359387..0dd5189fb7 100644
--- a/railties/html/index.html
+++ b/railties/html/index.html
@@ -229,6 +229,7 @@
<li><a href="http://api.rubyonrails.org/">Rails API</a></li>
<li><a href="http://stdlib.rubyonrails.org/">Ruby standard library</a></li>
<li><a href="http://corelib.rubyonrails.org/">Ruby core</a></li>
+ <li><a href="http://guides.rubyonrails.org/">Rails Guides</a></li>
</ul>
</li>
</ul>