diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2013-02-26 21:53:38 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2013-02-26 21:53:38 +0530 |
| commit | 7184e3e02ecd155cb26f4755dab980f2ce6582d2 (patch) | |
| tree | 04cb126b730c7fd98cb37ce68adb5320481db9af /activerecord | |
| parent | b1dee8c2535b2bca6ebe69d18c24d29f9ba19470 (diff) | |
| parent | b21a73d02576b7cd5ec88193065b3aa21c2d2407 (diff) | |
| download | rails-7184e3e02ecd155cb26f4755dab980f2ce6582d2.tar.gz rails-7184e3e02ecd155cb26f4755dab980f2ce6582d2.tar.bz2 rails-7184e3e02ecd155cb26f4755dab980f2ce6582d2.zip | |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'activerecord')
3 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/RUNNING_UNIT_TESTS.rdoc b/activerecord/RUNNING_UNIT_TESTS.rdoc index bdd8834dcb..2f3d516c43 100644 --- a/activerecord/RUNNING_UNIT_TESTS.rdoc +++ b/activerecord/RUNNING_UNIT_TESTS.rdoc @@ -2,7 +2,7 @@ If you don't have the environment set make sure to read - http://edgeguides.rubyonrails.org/contributing_to_ruby_on_rails.html#testing-active-record. + http://edgeguides.rubyonrails.org/contributing_to_ruby_on_rails.html#testing-active-record == Running the Tests diff --git a/activerecord/lib/active_record/associations/belongs_to_association.rb b/activerecord/lib/active_record/associations/belongs_to_association.rb index 532af3e83e..54b1a69774 100644 --- a/activerecord/lib/active_record/associations/belongs_to_association.rb +++ b/activerecord/lib/active_record/associations/belongs_to_association.rb @@ -1,5 +1,5 @@ module ActiveRecord - # = Active Record Belongs To Associations + # = Active Record Belongs To Association module Associations class BelongsToAssociation < SingularAssociation #:nodoc: diff --git a/activerecord/lib/active_record/connection_adapters/abstract/schema_dumper.rb b/activerecord/lib/active_record/connection_adapters/abstract/schema_dumper.rb index fd5eaab9c9..cc289d4a14 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/schema_dumper.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_dumper.rb @@ -4,7 +4,7 @@ module ActiveRecord # definitions to the Adapter instead of having it in the schema # dumper itself. This code represents the normal case. # We can then redefine how certain data types may be handled in the schema dumper on the - # Adapter level by over-writing this code inside the database spececific adapters + # Adapter level by over-writing this code inside the database specific adapters module ColumnDumper def column_spec(column, types) spec = prepare_column_options(column, types) |