aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Expand)AuthorAgeFilesLines
* Ensure that mass assignment options are preservedAndrew White2012-06-104-11/+55
* Build fix broken here 03f2249153ae4d2078646e6796d8b9e5ef747fbaArun Agrawal2012-06-101-1/+1
* Use . instead of :: for class methods, add CHANGELOG entriesJosé Valim2012-06-103-4/+7
* Merge pull request #6665 from schneems/schneems/raise-migration-errorJosé Valim2012-06-103-0/+54
|\
| * raise error for pending migration schneems2012-06-093-4/+35
| * add convenience methods for checking migrationsschneems2012-06-032-0/+23
* | Merge pull request #6683 from stevecj/fix-fragile-assert-queriesRafael Mendonça França2012-06-095-25/+37
|\ \
| * | Fix fragile #assert_queries implementation and usages.Steve Jorgensen2012-06-095-25/+37
* | | Remove conditional committed by accidentSantiago Pastorino2012-06-091-1/+1
* | | Use each_with_object instead of each hereSantiago Pastorino2012-06-092-4/+4
* | | Merge pull request #6687 from tiegz/3-2-optimizationsJosé Valim2012-06-091-1/+3
|/ /
* | Skip two tests with polymorphic if current adapter is Oracle Adapter.Yasuo Honda2012-06-081-0/+3
* | Merge pull request #6629 from marcandre/destroyCarlos Antonio da Silva2012-06-065-0/+34
|\ \
| * | + ActiveRecord::Base#destroy!Marc-Andre Lafortune2012-06-065-0/+34
* | | reduce number of StringsAkira Matsuda2012-06-061-1/+1
* | | Symbol responds_to :upcase & :downcase in Ruby >= 1.9Akira Matsuda2012-06-061-1/+1
* | | stop `to_s`ing method namesAkira Matsuda2012-06-062-3/+2
* | | Merge pull request #6616 from dpassage/fix_resolver_test_sqlite3Carlos Antonio da Silva2012-06-051-0/+3
|\ \ \ | |/ / |/| |
| * | The resolver tests fail if the mysql gem is not installed; this breaksDavid Paschich2012-06-031-0/+3
* | | Fix #6591. If a field with timezone isn't changed, we don't call will_change!.kennyj2012-06-041-1/+2
* | | Add failing test for 3.2.5 datetime attribute regressionEvan Arnold2012-06-041-0/+11
|/ /
* | a test case that ensures AR::Relation#merge can merge associationsAkira Matsuda2012-06-031-0/+8
* | minor comment revisionXavier Noria2012-06-011-1/+1
* | Sync CHANGLOG with the 3-2-stable branchRafael Mendonça França2012-06-011-0/+27
* | improve readability of AR explain resultAkira Matsuda2012-06-011-1/+7
* | unused method argumentsAkira Matsuda2012-06-011-7/+6
* | modulize AR::NullRelationAkira Matsuda2012-06-013-4/+9
* | Merge branch 'master-sec'Aaron Patterson2012-05-313-3/+37
|\ \
| * | predicate builder should not recurse for determining where columns.Aaron Patterson2012-05-303-3/+37
* | | Psych is always available on 1.9Jeremy Kemper2012-05-312-29/+23
* | | Fix changelog example for count method with block [ci skip]Carlos Antonio da Silva2012-05-311-1/+1
* | | Fix wrong example for count method with block [ci skip]Carlos Antonio da Silva2012-05-311-1/+1
* | | Work around undiagnosed bug that's draining a relation's bind_valuesJeremy Kemper2012-05-311-0/+1
* | | Fix backward compatibility with stored Hash values. Wrap coders to convert se...Jeremy Kemper2012-05-303-15/+51
* | | Merge pull request #6477 from steveklabnik/close_discovered_pg_connectionRafael Mendonça França2012-05-301-1/+2
|\ \ \ | |_|/ |/| |
| * | Properly discover a connection is closed in postgresql_adapterSteve Klabnik2012-05-241-1/+2
* | | Merge pull request #5810 from kennyj/fix_5797Aaron Patterson2012-05-304-5/+15
|\ \ \
| * | | Fix #5797. Error calling dup method on AR model with serialized fieldkennyj2012-05-304-5/+15
* | | | Merge pull request #6386 from kennyj/fix_logs_name_consistencyAaron Patterson2012-05-307-33/+123
|\ \ \ \
| * | | | Fix logs name consistency.kennyj2012-05-197-33/+123
* | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-305-27/+37
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | copy edit the batches docs [ci skip]Vijay Dev2012-05-301-9/+7
| * | | | change example on CollectionProxy#delete to accept multiple valuesFrancesco Rodriguez2012-05-281-1/+1
| * | | | Adds to Batch processing documentation [ci skip]Alvaro Pereyra2012-05-281-9/+20
| * | | | fix typo and remove 'examples' noise [ci skip]Francesco Rodriguez2012-05-281-18/+6
| * | | | Updates examples for FinderMethods [ci skip]Alvaro Pereyra2012-05-281-2/+14
| * | | | Merge branch 'master' of github.com:lifo/docrailsAlvaro Pereyra2012-05-2840-99/+798
| |\ \ \ \
| | * \ \ \ Merge pull request #102 from xenda/masterXenda2012-05-271-4/+4
| | |\ \ \ \
| | * | | | | "a sql" -> "an SQL" per API documentation guidelinesMark Rushakoff2012-05-271-1/+1
| * | | | | | Adds examples to FinderMethods#first [ci skip]Alvaro Pereyra2012-05-281-0/+1
| | |/ / / / | |/| | | |