aboutsummaryrefslogtreecommitdiffstats
path: root/railties/configs
diff options
context:
space:
mode:
Diffstat (limited to 'railties/configs')
-rw-r--r--railties/configs/databases/mysql.yml3
-rw-r--r--railties/configs/initializers/backtrace_silencers.rb2
2 files changed, 4 insertions, 1 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/configs/initializers/backtrace_silencers.rb b/railties/configs/initializers/backtrace_silencers.rb
index c2169ed01c..839d4cde19 100644
--- a/railties/configs/initializers/backtrace_silencers.rb
+++ b/railties/configs/initializers/backtrace_silencers.rb
@@ -3,5 +3,5 @@
# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.
# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ }
-# You can also remove all the silencers if you're trying do debug a problem that might steem from framework code.
+# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code.
# Rails.backtrace_cleaner.remove_silencers! \ No newline at end of file