aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into experimentAaron Patterson2013-05-171-2/+2
|\
| * stop swallowing exceptions in assert_queries. Methods that raise anAaron Patterson2013-05-171-2/+2
* | Merge branch 'master' into experimentAaron Patterson2013-05-171-2/+6
|\|
| * stop doing assingments in an iteratorAaron Patterson2013-05-171-2/+6
* | experimentAaron Patterson2013-05-172-16/+15
* | Merge branch 'master' into stmtAaron Patterson2013-05-172-6/+5
|\|
| * include bind values from the default scopeAaron Patterson2013-05-172-6/+5
* | more testingAaron Patterson2013-05-171-14/+1
* | just a testAaron Patterson2013-05-171-6/+2
* | Merge branch 'master' into stmtAaron Patterson2013-05-1784-342/+1142
|\|
| * let Ruby do the is_a check for usAaron Patterson2013-05-161-3/+4
| * test refactorAaron Patterson2013-05-161-5/+2
| * Add more data to AR::UnknownAttributeErrorBogdan Gusiev2013-05-163-1/+22
| * Merge pull request #10619 from alno/top_level_array_in_postgres_jsonAaron Patterson2013-05-163-1/+17
| |\
| | * Support array as root element in JSONAlexey Noskov2013-05-143-1/+17
| * | Check if APP_RAKEFILE is definedPiotr Sarnacki2013-05-161-1/+1
| * | Fix detection of engine in rake db:load_configJoel Cogen2013-05-161-1/+1
| * | tiny types should only be integers when the length is <= 1. fixes #10620Aaron Patterson2013-05-151-3/+9
| * | add failing test exposing mysql adapter tinyint bugphinze2013-05-151-3/+16
| * | require things we needAaron Patterson2013-05-151-0/+1
| * | Merge pull request #10504 from kennyj/support_pg_91Rafael Mendonça França2013-05-153-6/+8
| |\ \
| | * | Remove unnecessary code, because this extension is created on demand in hstor...kennyj2013-05-151-2/+0
| | * | Also support extensions in PostgreSQL 9.1, because this has been supported si...kennyj2013-05-152-4/+8
| * | | Merge pull request #10601 from Ichimonji10/fix-docsRafael Mendonça França2013-05-151-15/+27
| |\ \ \ | | |/ / | |/| |
| | * | Rewrite `activerecord/RUNNING_UNIT_TESTS`Jeremy Audet2013-05-151-15/+27
| | |/
| * | deprecating string based terminatorsAaron Patterson2013-05-141-1/+3
| * | Merge branch 'master' into normalizecbAaron Patterson2013-05-1317-50/+137
| |\|
| | * Merge pull request #10577 from vipulnsward/fix_method_typosRafael Mendonça França2013-05-123-3/+3
| | |\
| | | * Fix class and method name typosVipul A M2013-05-123-3/+3
| | * | Merge pull request #10556 from Empact/deprecate-schema-statements-distinctRafael Mendonça França2013-05-123-13/+31
| | * | Some editorial changes on the documentation.Rafael Mendonça França2013-05-122-27/+27
| | * | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-05-125-5/+13
| | |\ \ | | | |/ | | |/|
| | | * copy edits [ci skip]Vijay Dev2013-05-121-5/+1
| | | * Added documentation for ActiveRecord::Generators::MigrationGenerator.next_mig...aditya-kapoor2013-05-101-0/+4
| | | * Added documentation for ActiveRecord::Base#next_migration_numberaditya-kapoor2013-05-091-0/+5
| | | * minor rdoc cleanup for reflection methodsNeeraj Singh2013-05-091-4/+4
| | | * XML-files isn't a wordWaynn Lue2013-05-061-1/+1
| | | * added to rdoc for unscope that default_scope winsNeeraj Singh2013-05-031-0/+3
| | * | Adding documentation to the automatic inverse_of finder.wangjohn2013-05-112-1/+22
| | * | Improve CHANGELOG entry [ci kip]Rafael Mendonça França2013-05-111-6/+10
| | * | Call assume_migrated_upto_version on connectionKyle Stevens2013-05-113-1/+32
| | * | Merge pull request #10567 from neerajdotname/read_attribute_before_type_cast_...Rafael Mendonça França2013-05-113-1/+7
| | |\ \
| | | * | read_attribute_before_type_cast should accept symbolNeeraj Singh2013-05-113-1/+7
| | * | | Merge pull request #10572 from nertzy/dont-modify-options-hash-in-primary-keyRafael Mendonça França2013-05-111-2/+1
| | |/ /
| * / / callbacks are wrapped with lambdasAaron Patterson2013-05-101-1/+1
| |/ /
| * | Extract JoinDependency#join_relation to DRY the repeated application of the #...Ben Woosley2013-05-103-7/+9
| * | In #apply_join_dependency, we can apply the #where in-place because relation ...Ben Woosley2013-05-101-1/+1
| * | DRY-up join dependency creation by extracting construct_join_depdencyBen Woosley2013-05-101-7/+5
| * | Pull the excepts into apply_join_dependency, for the sake of DRY.Ben Woosley2013-05-101-3/+4
| * | Simplify conditions within apply_join_dependencyBen Woosley2013-05-101-9/+5