aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
Commit message (Expand)AuthorAgeFilesLines
* Revert "Update docs in sqlite3 adapter"Vijay Dev2012-05-171-12/+12
* Fix typos in docs for ActiveRecord::Core::arel_table [ci skip]Mark Rushakoff2012-05-161-3/+1
* Update AR has_one association exampleAlexey Vakhov2012-05-161-1/+1
* Update docs in sqlite3 adapterOscar Del Ben2012-05-151-12/+12
* Merge pull request #99 from GRoguelon/masterVijay Dev2012-05-151-1/+1
|\
| * Fix an error in example in methods of instanciated fixtures.Geoffrey Roguelon2012-05-151-1/+1
* | Fix typo [ci skip]Peter Suschlik2012-05-151-1/+1
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-151-0/+8
|\|
| * Add documentation for arel_tableOscar Del Ben2012-05-141-0/+8
* | Set the primary key during #copy_table if necessary. Fixes [#2312]Sean Scally2012-05-141-1/+5
* | Copy edit [ci skip]Rafael Mendonça França2012-05-131-3/+4
* | Merge pull request #5807 from Antiarchitect/store-improvementRafael Mendonça França2012-05-131-5/+10
|\ \
| * | Custom coders support for ActiveRecord::Store. JSON, YAML, Marshal can be use...Andrey Voronkov2012-05-091-5/+10
* | | fixes a nodoc which swallowed the documentation for the rest of the methods [...Vijay Dev2012-05-121-2/+1
* | | Merge pull request #6285 from acapilleri/missplelling_error_in_abstract_mysql...Vijay Dev2012-05-121-1/+1
|\ \ \ | |_|/ |/| |
| * | missplelling error in abstract_mysql_adapterAngelo Capilleri2012-05-121-1/+1
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-123-6/+28
|\ \ \
| * | | copy edits [ci skip]Vijay Dev2012-05-121-4/+1
| * | | Better document the difference between #clone and #dup.Erich Menge2012-05-111-1/+26
| * | | better wordingHrvoje Šimić2012-05-111-4/+4
| * | | missing 'with'Hrvoje Šimić2012-05-111-1/+1
| | |/ | |/|
* | | s/wether/whether [ci skip]Vijay Dev2012-05-121-1/+1
* | | Remove #=== quirkJon Leighton2012-05-111-6/+0
* | | this stuff can all be handled by RelationJon Leighton2012-05-111-38/+0
* | | extract deprecated codeJon Leighton2012-05-111-8/+1
* | | set_owner_attributes is covered by the scopingJon Leighton2012-05-111-4/+3
* | | CollectionProxy < RelationJon Leighton2012-05-116-51/+57
* | | Return false for exists? with new records - fixes #6199.Andrew White2012-05-101-2/+1
* | | remove unnecessary 'examples' noise [ci skip]Vijay Dev2012-05-112-28/+18
* | | Merge pull request #4254 from alexeymuranov/my-nicify-fixtures-rbJeremy Kemper2012-05-091-79/+80
|\ \ \
| * | | Rename some variablesAlexey Muranov2012-05-091-76/+80
| * | | Remove unused private method in fixtures.rbAlexey Muranov2012-05-091-3/+0
| * | | Remove unused parameter in ::instantiate_fixturesAlexey Muranov2012-05-091-5/+5
| |/ /
* | | Merge pull request #5362 from zenprogrammer/quoting_bugAaron Patterson2012-05-091-0/+1
|\ \ \
| * | | Fixed bug in Quoting that caused classes to be quoted incorrectlyRyan Oblak2012-03-091-0/+1
* | | | Fix transaction state not changing when after record gets commitedHemant Kumar2012-05-091-6/+2
| |/ / |/| |
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-082-2/+3
|\ \ \
| * | | Doc for ActiveRecord::Result empty? methodRob Zolkos2012-05-071-0/+1
| * | | SpawnMethods#merge returns the intersection when passed an array, and not the...Mitch Crowe2012-05-051-2/+2
* | | | Use deep_dup in aciverecord default columns assignmentPiotr Sarnacki2012-05-061-4/+2
* | | | Merge pull request #6173 from mhfs/takes_instead_firstJeremy Kemper2012-05-051-4/+4
|\ \ \ \
| * | | | Use `take` instead of `first` to avoid unwanted implicit ordering (fixes #6147)Marcelo Silveira2012-05-051-4/+4
* | | | | Merge pull request #6069 from mipearson/use_strict_mode_in_mysqlJeremy Kemper2012-05-052-0/+16
|\ \ \ \ \
| * | | | | Add config option, rdoc, tests for mysql(2) STRICT_ALL_TABLES mode.Michael Pearson2012-05-052-4/+9
| * | | | | Default to 'strict mode' in MySQLMichael Pearson2012-05-052-0/+11
| |/ / / /
* | | | | Merge pull request #6054 from flexoid/column-fixJon Leighton2012-05-051-3/+3
|\ \ \ \ \
| * | | | | Prevent creating valid time-like objects from blank string from dbEgor Lynko2012-05-051-3/+3
* | | | | | Revert "Merge pull request #5494 from armstrjare/active_record_relation_keep_...Jon Leighton2012-05-053-35/+5
|/ / / / /
* | | | | Merge pull request #5494 from armstrjare/active_record_relation_keep_associat...Jon Leighton2012-05-053-5/+35
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Allow ActiveRecord::Relation merges to maintain context of joined associationsJared Armstrong2012-05-043-5/+35