Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | Opt in to JSON | Jeremy Kemper | 2009-04-22 | 1 | -0/+2 | |
| | | | ||||||
| * | | Opt in to Dependencies | Jeremy Kemper | 2009-04-22 | 1 | -0/+1 | |
| |/ | ||||||
| * | No more free lunch | Jeremy Kemper | 2009-04-22 | 1 | -0/+1 | |
| | | ||||||
* | | Merge branch 'master' into active_model | Pratik Naik | 2009-04-22 | 21 | -86/+373 | |
|\| | | | | | | | | | Conflicts: activeresource/lib/active_resource/validations.rb | |||||
| * | Add microsecond support for sqlite adapter [#1982 state:resolved] | Alex Pooley | 2009-04-21 | 2 | -1/+11 | |
| | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | |||||
| * | Change table to prevent copying indexes on sqlite2 | Pratik Naik | 2009-04-21 | 1 | -5/+5 | |
| | | ||||||
| * | Specify :group with the table name for it to work on sqlite3 | Pratik Naik | 2009-04-21 | 1 | -1/+1 | |
| | | ||||||
| * | Fix tests for sqlite3 3.6.xx | Pratik Naik | 2009-04-21 | 1 | -1/+1 | |
| | | ||||||
| * | Fixed dumping from postgresql columns in index in wrong order. [#2515 ↵ | Max Lapshin | 2009-04-21 | 3 | -15/+25 | |
| | | | | | | | | | | | | state:resolved] Signed-off-by: Tarmo Tänav <tarmo@itech.ee> | |||||
| * | Quote table names when casting to regclass so that capitalized tables are ↵ | Scott Woods | 2009-04-21 | 4 | -3/+34 | |
| | | | | | | | | | | | | supported. [#2418 state:resolved] Signed-off-by: Tarmo Tänav <tarmo@itech.ee> | |||||
| * | Fixed wrong quoting of index names in postgres [#2402 state:resolved] | Max Lapshin | 2009-04-21 | 2 | -1/+11 | |
| | | | | | | | | Signed-off-by: Tarmo Tänav <tarmo@itech.ee> | |||||
| * | Ensure :dependent => :delete_all works for association with hash conditions | Pratik Naik | 2009-04-20 | 4 | -9/+14 | |
| | | ||||||
| * | Ensure JoinAssociation uses aliased table name when multiple associations ↵ | Pratik Naik | 2009-04-20 | 5 | -5/+12 | |
| | | | | | | | | have hash conditions on the same table | |||||
| * | Added :touch option to belongs_to associations that will touch the parent ↵ | David Heinemeier Hansson | 2009-04-16 | 6 | -29/+110 | |
| | | | | | | | | record when the current record is saved or destroyed [DHH] | |||||
| * | Added ActiveRecord::Base#touch to update the updated_at/on attributes with ↵ | David Heinemeier Hansson | 2009-04-16 | 3 | -9/+64 | |
| | | | | | | | | the current time [DHH] | |||||
| * | Bring abstract_controller up to date with rails/master | Carl Lerche & Yehuda Katz | 2009-04-13 | 82 | -1532/+4197 | |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolved all the conflicts since 2.3.0 -> HEAD. Following is a list of commits that could not be applied cleanly or are obviated with the abstract_controller refactor. They all need to be revisited to ensure that fixes made in 2.3 do not reappear in 3.0: 2259ecf368e6a6715966f69216e3ee86bf1a82a7 AR not available * This will be reimplemented with ActionORM or equivalent 06182ea02e92afad579998aa80144588e8865ac3 implicitly rendering a js response should not use the default layout [#1844 state:resolved] * This will be handled generically 893e9eb99504705419ad6edac14d00e71cef5f12 Improve view rendering performance in development mode and reinstate template recompiling in production [#1909 state:resolved] * We will need to reimplement rails-dev-boost on top of the refactor; the changes here are very implementation specific and cannot be cleanly applied. The following commits are implicated: 199e750d46c04970b5e7684998d09405648ecbd4 3942cb406e1d5db0ac00e03153809cc8dc4cc4db f8ea9f85d4f1e3e6f3b5d895bef6b013aa4b0690 e3b166aab37ddc2fbab030b146eb61713b91bf55 ae9f258e03c9fd5088da12c1c6cd216cc89a01f7 44423126c6f6133a1d9cf1d0832b527e8711d40f 0cb020b4d6d838025859bd60fb8151c8e21b8e84 workaround for picking layouts based on wrong view_paths [#1974 state:resolved] * The specifics of this commit no longer apply. Since it is a two-line commit, we will reimplement this change. 8c5cc66a831aadb159f3daaffa4208064c30af0e make action_controller/layouts pick templates from the current instance's view_paths instead of the class view_paths [#1974 state:resolved] * This does not apply at all. It should be trivial to apply the feature to the reimplemented ActionController::Base. 87e8b162463f13bd50d27398f020769460a770e3 fix HTML fallback for explicit templates [#2052 state:resolved] * There were a number of patches related to this that simply compounded each other. Basically none of them apply cleanly, and the underlying issue needs to be revisited. After discussing the underlying problem with Koz, we will defer these fixes for further discussion. | |||||
| | * | Support multiple schemas in table names for postgresql [#390 state:resolved] | Max Lapshin | 2009-04-05 | 2 | -1/+74 | |
| | | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | |||||
| | * | Merge docrails | Pratik Naik | 2009-04-05 | 1 | -0/+2 | |
| | | | ||||||
| | * | Ensure SqlBypass use ActiveRecord::Base connection | Luca Guidi | 2009-04-05 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#https://rails.lighthouseapp.com/attachments/106066/0001-Ensure-SqlBypass-use-ActiveRecord-Base-connection.patch state:committed] | |||||
| | * | Merge docrails | Pratik Naik | 2009-03-24 | 1 | -10/+13 | |
| | | | ||||||
| * | | Merge commit 'rails/3-0-unstable' | Yehuda Katz | 2009-01-30 | 1 | -1/+1 | |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: actionpack/lib/action_controller/base.rb actionpack/lib/action_dispatch/http/mime_type.rb actionpack/lib/action_dispatch/http/request.rb actionpack/lib/action_view/base.rb actionpack/lib/action_view/paths.rb actionpack/test/controller/session/cookie_store_test.rb actionpack/test/dispatch/rack_test.rb actionpack/test/dispatch/request_test.rb | |||||
| | * | | Move HTTP libs and middleware into ActionDispatch component | Joshua Peek | 2009-01-27 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Deprecate Model#validate/validate_on_create/validate_on_update. Use ↵ | Pratik Naik | 2009-03-21 | 5 | -22/+67 | |
| | | | | | | | | | | | | | | | | Model.validate :method and likewise | |||||
* | | | | Deprecate Errors#on_base/add_to_base/invalid?/each_full | Pratik Naik | 2009-03-21 | 1 | -2/+2 | |
| | | | | ||||||
* | | | | Move validate_on_create and validate_on_update from ActiveModel to ActiveRecord | Pratik Naik | 2009-03-21 | 2 | -4/+13 | |
| | | | | ||||||
* | | | | Add ActiveModel::Validations tests for regular ruby classes | Pratik Naik | 2009-03-20 | 1 | -0/+9 | |
| | | | | ||||||
* | | | | Add I18n translations to ActiveModel and move more AR specific parts to ↵ | Pratik Naik | 2009-03-20 | 4 | -0/+869 | |
| | | | | | | | | | | | | | | | | ActiveRecord::Validations | |||||
* | | | | Include ActiveModel::Validations from ActiveRecord::Validations | Pratik Naik | 2009-03-20 | 2 | -21/+30 | |
| | | | | ||||||
* | | | | Deprecate Error#on(attribute) in favour of Errors#[attribute] | Pratik Naik | 2009-03-20 | 5 | -25/+25 | |
| | | | | ||||||
* | | | | Move relevant validation tests from Active Record to Active Model | Pratik Naik | 2009-03-20 | 6 | -2384/+506 | |
| | | | | ||||||
* | | | | Make Active Model test suite similar to Active Record | Pratik Naik | 2009-03-20 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Make Active Resource use ActiveModel::Errors | Pratik Naik | 2009-03-19 | 1 | -3/+1 | |
| | | | | ||||||
* | | | | Move uniqueness and association validations to Active Record | Pratik Naik | 2009-03-19 | 3 | -0/+211 | |
| | | | | ||||||
* | | | | Move all the Active Record validations to Active Model | Pratik Naik | 2009-03-19 | 8 | -1139/+147 | |
| |_|/ |/| | | ||||||
* | | | Merge docrails | Pratik Naik | 2009-03-16 | 4 | -23/+35 | |
| | | | ||||||
* | | | Prepare for final 2.3 release | David Heinemeier Hansson | 2009-03-15 | 3 | -5/+3 | |
| | | | ||||||
* | | | SQLite adapters now support DDL transactions [#2080 state:resolved] | Jason King | 2009-03-14 | 3 | -28/+68 | |
| | | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | |||||
* | | | Fix spelling of an internal method [#1734 state:resolved] | Chris Kampmeier | 2009-03-12 | 2 | -4/+4 | |
| | | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | |||||
* | | | Ensure AutosaveAssociation runs remove callbacks [#2146 state:resolved] | Luca Guidi | 2009-03-12 | 7 | -21/+185 | |
| | | | | | | | | | | | | | | | Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com> Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | |||||
* | | | Returning nil from named scope lambda is equivalent to an empty hash [#1773 ↵ | Elijah Miller | 2009-03-12 | 3 | -1/+10 | |
| | | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | |||||
* | | | Ensure NoMethodError isn't raised when some of the nested eager loaded ↵ | Murray Steele | 2009-03-12 | 2 | -4/+38 | |
| | | | | | | | | | | | | | | | | | | associations are empty [#1696 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | |||||
* | | | Fixed autosave checks on objects with hm:t in :include [#2213 state:resolved] | Will Bryant | 2009-03-12 | 4 | -1/+49 | |
| | | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | |||||
* | | | Ensure ActiveRecord::Base.find_in_batches fires doesnt fire an extra query ↵ | Pratik Naik | 2009-03-11 | 3 | -2/+17 | |
| | | | | | | | | | | | | unless needed | |||||
* | | | Add tests for AssociationCollection#find_each and ↵ | Pratik Naik | 2009-03-11 | 2 | -1/+40 | |
| | | | | | | | | | | | | AssociationCollection#find_in_batches | |||||
* | | | Add NamedScope#find_each tests [#2201 state:resolved] | Pratik Naik | 2009-03-11 | 1 | -1/+15 | |
| | | | ||||||
* | | | Rename ActiveRecord::Base.each to ActiveRecord::Base.find_each | Pratik Naik | 2009-03-11 | 3 | -7/+6 | |
| | | | ||||||
* | | | Don't duplicate :order from scope and options, it makes mysql do extra work | Jeremy Kemper | 2009-03-10 | 2 | -3/+7 | |
| | | | ||||||
* | | | Ensure nested with_scope merges conditions inside out [#2193 state:resolved] | Manfred Stienstra | 2009-03-10 | 4 | -26/+57 | |
| | | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | |||||
* | | | Ensure ActiveRecord#to_xml respects :skip_types for included associations ↵ | Bruce Krysiak | 2009-03-10 | 2 | -7/+24 | |
| | | | | | | | | | | | | | | | | | | [#1632 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | |||||
* | | | Ensure Model#destroy respects optimistic locking [#1966 state:resolved] | Curtis Hawthorne | 2009-03-09 | 2 | -0/+51 | |
| | | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> |