aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2010-07-13 18:41:09 +0200
committerXavier Noria <fxn@hashref.com>2010-07-13 18:41:09 +0200
commit6d2e4ee96c22502380dc94bebdead56133143b9e (patch)
treed25bddeda96903d0a6ec75ca087898875fa2981d /activerecord/lib/active_record/connection_adapters
parentb75fca9e57423eec81384ff3e35f38fd4f7fe47f (diff)
parent7e075e62479a0eccad6eaf7a7c20f45347860c83 (diff)
downloadrails-6d2e4ee96c22502380dc94bebdead56133143b9e.tar.gz
rails-6d2e4ee96c22502380dc94bebdead56133143b9e.tar.bz2
rails-6d2e4ee96c22502380dc94bebdead56133143b9e.zip
Merge remote branch 'docrails/master'
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters')
-rw-r--r--activerecord/lib/active_record/connection_adapters/mysql_adapter.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
index aa3626a37e..b403443d8e 100644
--- a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
@@ -125,7 +125,7 @@ module ActiveRecord
# By default, the MysqlAdapter will consider all columns of type <tt>tinyint(1)</tt>
# as boolean. If you wish to disable this emulation (which was the default
# behavior in versions 0.13.1 and earlier) you can add the following line
- # to your environment.rb file:
+ # to your application.rb file:
#
# ActiveRecord::ConnectionAdapters::MysqlAdapter.emulate_booleans = false
cattr_accessor :emulate_booleans