Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'mainstream/master' | Pratik Naik | 2009-03-10 | 18 | -222/+348 |
|\ | | | | | | | | | | | | | Conflicts: railties/guides/files/stylesheets/main.css railties/guides/rails_guides/generator.rb railties/guides/source/index.erb.textile | ||||
| * | Ensure Model#destroy respects optimistic locking [#1966 state:resolved] | Curtis Hawthorne | 2009-03-09 | 1 | -0/+33 |
| | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Ensure has_many :through works with changed primary keys [#736 state:resolved] | Jim Remsik and Tim Pope | 2009-03-09 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Allow find(:last) :order be a symbol [#2024 state:resolved] | Rob Anderton | 2009-03-09 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Fix find_by_last when order is given [#2127 state:committed] | Jan De Poorter | 2009-03-09 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
| * | Add ActiveRecord::Base#invalid? as the opposite of #valid? [#2159 ↵ | Jeffrey Hardy | 2009-03-08 | 1 | -0/+5 |
| | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Ensure SQLite adapters stores the config [#1947 state:resolved] [John ↵ | John Aughey | 2009-03-08 | 2 | -3/+8 |
| | | | | | | | | | | | | Aughey, Pratik Naik] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Ensure calculations respect scoped :select [#1334 state:resolved] | stopdropandrew | 2009-03-07 | 1 | -5/+13 |
| | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Ensure validates_uniqueness_of considers limit on the field. [#1042 ↵ | Arthur Klepchukov | 2009-03-07 | 1 | -4/+4 |
| | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Fix RDoc grammar and ensure hm:t tests can run in isolation. [#1644 ↵ | Adam Milligan | 2009-03-07 | 2 | -3/+3 |
| | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | DRY with_kcode in Active Record tests | Pratik Naik | 2009-03-07 | 1 | -0/+13 |
| | | |||||
| * | Allow :having conditions to be sanitized like regular :condition. [#2158 ↵ | Will Bryant | 2009-03-06 | 2 | -5/+7 |
| | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Ensure belongs_to association with a counter cache in name spaced model ↵ | Adam Cooper | 2009-03-06 | 2 | -4/+2 |
| | | | | | | | | | | | | works [#1678 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Ensure replacing has_one associations respects the supplied :dependent ↵ | Dimitri Krassovski | 2009-03-06 | 1 | -2/+11 |
| | | | | | | | | | | | | option. [#1305 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Ensure supplie :from has precedence over scoped :from [#1370 state:resolved] | Pratik Naik | 2009-03-06 | 1 | -1/+1 |
| | | |||||
| * | Ensure self referential HABTM associations raise an exception if ↵ | Tom Lea | 2009-03-06 | 1 | -0/+10 |
| | | | | | | | | | | | | association_foreign_key is missing. [#1252 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Methods invoked within named scope Procs should respect the scope stack. ↵ | jvoorhis | 2009-03-06 | 1 | -1/+6 |
| | | | | | | | | | | | | [#1267 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Fixed reset_session for ActiveRecord session store [#2108 state:resolved] | Joshua Peek | 2009-03-03 | 1 | -3/+7 |
| | | |||||
| * | Revert "DDL transactions and savepoints for sqlite" | Michael Koziarski | 2009-03-02 | 1 | -20/+1 |
| | | | | | | | | | | | | | | | | | | This reverts commit 38136f86dc5504bde94dc7399d4a854023d7481f. Caused several test failures on the ci box: http://ci.rubyonrails.org/builds/rails/38136f [#2080 state:open] | ||||
| * | DDL transactions and savepoints for sqlite | Jason King | 2009-03-02 | 1 | -1/+20 |
| | | | | | | | | | | | | | | | | | | | | | | Sqlite has had DDL transactions since 2.0.0[1] and savepoints since 3.6.8[2]. This patch updates the connection_adapters. [1] http://tinyurl.com/sqlite-v2-0-0 [2] http://tinyurl.com/sqlite-v3-6-8 Signed-off-by: Michael Koziarski <michael@koziarski.com> [#2080 state:committed] | ||||
| * | Merge docrails and update the release notes | Pratik Naik | 2009-02-28 | 1 | -0/+19 |
| | | |||||
| * | Fix that scoped find with :group and :having [#2006 state:resolved] | Mike Gunderloy | 2009-02-28 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Prep for RC2 later today | David Heinemeier Hansson | 2009-02-27 | 1 | -1/+1 |
| | | |||||
| * | Update rdoc: all is not a named_scope [#1959 state:committed] | Zack Hobson | 2009-02-27 | 1 | -2/+3 |
| | | | | | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
| * | Force all internal calls to Array#to_sentence to use English [#2010 ↵ | David Heinemeier Hansson | 2009-02-27 | 1 | -1/+1 |
| | | | | | | | | state:resolved] | ||||
| * | Don't validate records of an :autosave association if they're marked for ↵ | Eloy Duran | 2009-02-27 | 1 | -4/+7 |
| | | | | | | | | | | | | destruction. [#2064 status:resolved] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
| * | Fixed that autosave should validate associations even if master is invalid ↵ | David Heinemeier Hansson | 2009-02-27 | 5 | -182/+187 |
| | | | | | | | | [#1930 status:committed] | ||||
| * | Fixed bug that makes named_scopes _forgot_ current scope | Diego Algorta | 2009-02-25 | 1 | -2/+11 |
| | | |||||
| * | Ensure ActiveRecord session store's connections are checked in after each ↵ | Joshua Peek | 2009-02-24 | 1 | -0/+16 |
| | | | | | | | | request [#1927 state:resolved] | ||||
* | | remove unneeded curlies in AR::Base.update example | Xavier Noria | 2009-03-08 | 1 | -2/+2 |
| | | |||||
* | | removes questionable :message examples (reported in Rails LH #2107) | Xavier Noria | 2009-03-04 | 1 | -1/+1 |
| | | |||||
* | | describe action of include_root_in_json in to_json docs | Matt Jones | 2009-02-27 | 1 | -0/+19 |
|/ | |||||
* | Merge with docrails | Pratik Naik | 2009-02-24 | 4 | -99/+110 |
| | |||||
* | Fix docs | David Heinemeier Hansson | 2009-02-23 | 1 | -2/+2 |
| | |||||
* | Added ActiveRecord::Base.each and ActiveRecord::Base.find_in_batches for ↵ | David Heinemeier Hansson | 2009-02-23 | 3 | -1/+72 |
| | | | | batch processing [DHH/Jamis Buck] | ||||
* | Revert "Wrap calls to update_attributes in a transaction." | Michael Koziarski | 2009-02-22 | 1 | -15/+1 |
| | | | | | | | This caused failures on sqlite, sqlite3 and postgresql This reverts commit fc09ebc669bd58f415f7d3ef932ef02dab821ab5. [#922 state:reopened] | ||||
* | Wrap calls to update_attributes in a transaction. | Xavier Noria | 2009-02-22 | 1 | -1/+15 |
| | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#922 state:committed] | ||||
* | Changed API of NestedAttributes to take an array, or hash with index keys, ↵ | Lance Ivy | 2009-02-13 | 1 | -100/+146 |
| | | | | | | | | of hashes that have the id on the inside of the attributes hash and updated the FormBuilder to produce such hashes. Also fixed NestedAttributes with composite ids. Signed-off-by: Michael Koziarski <michael@koziarski.com> Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com> [#1892 state:committed] | ||||
* | Merge branch 'master' of git@github.com:rails/rails | Jeremy Kemper | 2009-02-05 | 8 | -12/+52 |
|\ | |||||
| * | Merge docrails along with the new guides and guides generation code | Pratik Naik | 2009-02-06 | 1 | -0/+16 |
| | | |||||
| * | Don't use weird attribute_condition methods in AR Session Store | Michael Koziarski | 2009-02-06 | 1 | -1/+1 |
| | | | | | | | | Use the hash condition for find instead. | ||||
| * | support end-exclusive ... Ranges in SQL hash condition sanitization properly | Will Bryant | 2009-02-06 | 2 | -7/+11 |
| | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1865 state:committed] | ||||
| * | Support true/false in query_attribute for calculated columns | Max Lapshin | 2009-02-06 | 2 | -0/+2 |
| | | | | | | | | | | Signed-off-by: Tarmo Tänav <tarmo@itech.ee> Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
| * | Also save :autosave enabled associations when #save! is used. | Eloy Duran | 2009-02-06 | 1 | -0/+12 |
| | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1877 state:committed] | ||||
| * | Nested attribute accessors should ignore new records with truthy _delete key. | Pascal Ehlert | 2009-02-06 | 1 | -2/+6 |
| | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1861 state:committed] | ||||
| * | Add ActiveRecord::Base.exists? with no args [#1817 state:committed] | Scott Taylor | 2009-02-05 | 1 | -2/+4 |
| | | | | | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
* | | Migrations: make default database connection overridable | Jeremy Kemper | 2009-02-04 | 1 | -1/+5 |
|/ | |||||
* | Merge docrails | Pratik Naik | 2009-02-01 | 1 | -4/+5 |
| | |||||
* | validate_length_of should use custom message if given when using in or within. | miloops | 2009-02-01 | 1 | -5/+4 |
| | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1057 state:committed] | ||||
* | Add support for nested object forms to ActiveRecord and the helpers in ↵ | Eloy Duran | 2009-02-01 | 7 | -43/+553 |
| | | | | | | | | ActionPack Signed-Off-By: Michael Koziarski <michael@koziarski.com> [#1202 state:committed] |