Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'mainstream/master' | Pratik Naik | 2008-12-16 | 3 | -0/+321 |
|\ | |||||
| * | Switch to Rack based session stores. | Joshua Peek | 2008-12-15 | 2 | -0/+320 |
| | | |||||
| * | Require mocha >= 0.9.3, older versions don't work anymore [#1579 state:resolved] | Hongli Lai (Phusion) | 2008-12-15 | 1 | -0/+1 |
| | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | | Documented some undocumented activerecord methods. | Ryan Bigg | 2008-12-16 | 2 | -3/+6 |
| | | |||||
* | | Merge commit 'mainstream/master' | Pratik Naik | 2008-12-11 | 12 | -25/+58 |
|\| | | | | | | | | | | | | | Conflicts: railties/doc/guides/html/activerecord_validations_callbacks.html railties/doc/guides/source/activerecord_validations_callbacks.txt | ||||
| * | Don't use the transaction instance method so that people with ↵ | Frederick Cheung | 2008-12-10 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | has_one/belongs_to :transaction aren't fubared [#1551 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Merge branch 'master' of git@github.com:rails/rails | Jeremy Kemper | 2008-12-10 | 2 | -7/+23 |
| |\ | |||||
| | * | Added a :camelize option to ActiveRecord and Hash to_xml serialization and ↵ | Bruce Krysiak | 2008-12-10 | 2 | -7/+23 |
| | | | | | | | | | | | | | | | | | | from_xml deserialization Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
| * | | Revert "Fix: counter_cache should decrement on deleting associated records." | Jeremy Kemper | 2008-12-10 | 3 | -37/+0 |
| |/ | | | | | | | | | | | [#1196 state:open] This reverts commit 05f2183747c8e75c9e8bbaadb9573b4bdf41ecfc. | ||||
| * | Fix test names collision. | Emilio Tagua | 2008-12-10 | 1 | -4/+4 |
| | | | | | | | | | | | | [#1549 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Add ActiveRecord::VERSION autoload | Jeremy Kemper | 2008-12-10 | 1 | -0/+2 |
| | | |||||
| * | Fix: counter_cache should decrement on deleting associated records. | Emilio Tagua | 2008-12-10 | 3 | -0/+37 |
| | | | | | | | | | | | | [#1195 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Rework ActiveSupport::OrderedHash to make lookups faster | Frederick Cheung | 2008-12-10 | 1 | -2/+3 |
| | | | | | | | | | | | | [#1352 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Benchmark.ms | Jeremy Kemper | 2008-12-09 | 2 | -7/+7 |
| | | |||||
| * | Changelog entry for #1294 | Jeremy Kemper | 2008-12-08 | 1 | -0/+2 |
| | | |||||
| * | Make word separator in AR validation error messages configurable. | Akira Matsuda | 2008-12-08 | 1 | -1/+1 |
| | | | | | | | | | | | | [#1294 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Change field_changed? method to handle the case where a nullable integer ↵ | Ben Symonds | 2008-12-08 | 2 | -2/+14 |
| | | | | | | | | | | | | | | | | column is changed from 0 to '0' [#1530 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Merge with docrails | Pratik Naik | 2008-12-07 | 6 | -28/+67 |
| | | |||||
* | | Fix bad RDoc markup on update_all. | Mike Gunderloy | 2008-12-10 | 1 | -2/+1 |
| | | |||||
* | | Update documentation for default_scope | Daniel Luz | 2008-12-08 | 1 | -2/+2 |
| | | |||||
* | | Fix method "exists?" name in documentation | Daniel Luz | 2008-12-08 | 1 | -5/+5 |
| | | |||||
* | | Remove bad markup on validation method placeholders | Mike Gunderloy | 2008-12-08 | 1 | -3/+3 |
| | | |||||
* | | Merge commit 'mainstream/master' | Pratik Naik | 2008-12-07 | 45 | -457/+567 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: actionmailer/lib/action_mailer/base.rb actionpack/lib/action_controller/base.rb actionpack/lib/action_controller/mime_type.rb railties/doc/guides/html/activerecord_validations_callbacks.html railties/doc/guides/html/caching_with_rails.html railties/doc/guides/html/command_line.html railties/doc/guides/html/configuring.html railties/doc/guides/html/creating_plugins.html railties/doc/guides/html/finders.html railties/doc/guides/html/routing_outside_in.html railties/doc/guides/source/activerecord_validations_callbacks.txt railties/doc/guides/source/caching_with_rails.txt railties/doc/guides/source/command_line.txt railties/doc/guides/source/creating_plugins/acts_as_yaffle.txt railties/doc/guides/source/creating_plugins/controllers.txt railties/doc/guides/source/creating_plugins/core_ext.txt railties/doc/guides/source/creating_plugins/helpers.txt railties/doc/guides/source/creating_plugins/index.txt railties/doc/guides/source/creating_plugins/migration_generator.txt railties/doc/guides/source/creating_plugins/models.txt railties/doc/guides/source/creating_plugins/odds_and_ends.txt railties/doc/guides/source/creating_plugins/routes.txt railties/doc/guides/source/finders.txt railties/doc/guides/source/routing_outside_in.txt railties/doc/guides/source/testing_rails_applications.txt | ||||
| * | Make NoMethodError message more descriptive when an undefined message has ↵ | Mike Ferrier | 2008-12-04 | 1 | -1/+4 |
| | | | | | | | | | | | | been sent to an association [#1515 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| * | Add :having option to find, to use in combination with grouped finds. Also ↵ | miloops | 2008-12-01 | 10 | -7/+37 |
| | | | | | | | | | | | | | | added to has_many and has_and_belongs_to_many associations. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1028 state:committed] | ||||
| * | Removed extra 'as' in :joins clause for habtm preloading | Foliosus | 2008-12-01 | 1 | -1/+1 |
| | | | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1405 state:committed] | ||||
| * | Ensure hash conditions on referenced tables are considered when eager ↵ | Paul | 2008-11-26 | 2 | -2/+19 |
| | | | | | | | | | | | | loading with limit/offset. [#1404 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Rename use_transactional_fixtures? so it doesn't collide with the ↵ | Jeremy Kemper | 2008-11-25 | 1 | -4/+4 |
| | | | | | | | | superclass_delegating_accessor's query method | ||||
| * | Add config.preload_frameworks to load all frameworks at startup. Default to ↵ | Jeremy Kemper | 2008-11-24 | 1 | -2/+0 |
| | | | | | | | | false so Rails autoloads itself as it's used. | ||||
| * | missed ActiveRecord::Migrator | Joshua Peek | 2008-11-24 | 1 | -0/+1 |
| | | |||||
| * | get activerecord tests passing with lazy loading | Joshua Peek | 2008-11-24 | 2 | -0/+6 |
| | | |||||
| * | fixtures depends on dependencies | Joshua Peek | 2008-11-24 | 1 | -0/+1 |
| | | |||||
| * | require json lib when serialization is loaded | Joshua Peek | 2008-11-24 | 1 | -0/+2 |
| | | |||||
| * | Add LAZY env flag for testing autoload/lazy load feature | Joshua Peek | 2008-11-24 | 1 | -1/+1 |
| | | |||||
| * | Autoload ActiveRecord files | Joshua Peek | 2008-11-24 | 7 | -55/+61 |
| | | |||||
| * | Docfix [#1444 state:committed] | David Heinemeier Hansson | 2008-11-23 | 1 | -2/+2 |
| | | |||||
| * | Remove SQL Server cases from tests for latest adapter work to pass rails ↵ | Ken Collins | 2008-11-19 | 11 | -153/+17 |
| | | | | | | | | | | | | expected behavior. Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
| * | Remove reset! as a connection#checkout callback | Pratik Naik | 2008-11-19 | 1 | -1/+1 |
| | | |||||
| * | Assume that the next version is going to be 2.3 for now | David Heinemeier Hansson | 2008-11-19 | 2 | -3/+3 |
| | | |||||
| * | use :en as a default locale (in favor of :en-US) | Sven Fuchs | 2008-11-18 | 4 | -56/+56 |
| | | | | | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
| * | Fix default_scope to work in combination with named scopes | Tom Stuart | 2008-11-17 | 3 | -11/+17 |
| | | | | | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
| * | Ensure shared default_scoping stack is duped before assigning to thread local | Joshua Peek | 2008-11-16 | 1 | -1/+1 |
| | | |||||
| * | Added default_scope to Base [#1381 state:committed] (Paweł Kondzior) | Pratik Naik | 2008-11-16 | 4 | -1/+104 |
| | | |||||
| * | Ensure @@already_loaded_fixtures is initialized before use | Pratik Naik | 2008-11-16 | 1 | -1/+1 |
| | | |||||
| * | Revert "Added default_scope to Base [#1381 state:committed] (Paweł ↵ | David Heinemeier Hansson | 2008-11-16 | 4 | -76/+0 |
| | | | | | | | | | | | | Kondzior)" -- won't gel with threads. This reverts commit ff594b2bc94ff2a942fe6ca05672387722dee686. | ||||
| * | Added default_scope to Base [#1381 state:committed] (Paweł Kondzior) | David Heinemeier Hansson | 2008-11-16 | 4 | -0/+76 |
| | | |||||
| * | Add create_fixtures method for tests | Jeremy Kemper | 2008-11-15 | 1 | -0/+4 |
| | | |||||
| * | Set up fixtures for AR tests | Jeremy Kemper | 2008-11-15 | 1 | -0/+8 |
| | | |||||
| * | Merge branch 'master' into testing | Jeremy Kemper | 2008-11-15 | 15 | -12/+87 |
| |\ | |||||
| | * | Moved the * strings out of construct_finder_sql to a new default_select ↵ | Will Bryant | 2008-11-15 | 1 | -1/+9 |
| | | | | | | | | | | | | | | | | | | | | | method so it can be overridden by plugins cleanly Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1371 state:resolved] |