Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into sprockets | Joshua Peek | 2011-03-30 | 96 | -608/+1729 |
|\ | |||||
| * | Fix filter :only and :except with implicit actions | Andrew White | 2011-03-23 | 2 | -12/+17 |
| | | | | | | | | | | | | | | The method_name argument is "default_render" for implicit actions so use the action_name attribute to determine which callbacks to run. [#5673 state:resolved] | ||||
| * | Add a failing test case for an implicit action with a before filter. | Manfred Stienstra | 2011-03-23 | 3 | -0/+24 |
| | | | | | | | | Signed-off-by: Andrew White <andyw@pixeltrix.co.uk> | ||||
| * | Fix before_type_cast for timezone aware attributes by caching converted ↵ | Adam Meehan | 2011-03-23 | 2 | -19/+16 |
| | | | | | | | | value on write. Also remove read method reload arg on timezone attributes. | ||||
| * | Make clearing of HABTM join table contents happen in an after_destory callback. | Murray Steele | 2011-03-23 | 1 | -12/+12 |
| | | | | | | | | The old method of redefining destroy meant that clearing the HABTM join table would happen as long as the call to destroy succeeded. Which meant if there was a before_destroy that stopped the instance being destroyed using normal means (returning false, raising ActiveRecord::Rollback) rather than exceptional means the join table would be cleared even though the instance wasn't destroyed. Doing it in an after_destroy hook avoids this and has the advantage of happening inside the DB transaction too. | ||||
| * | Failing test case to show that habtm join table contents are removed when a ↵ | Murray Steele | 2011-03-23 | 1 | -0/+34 |
| | | | | | | | | model is destroyed but the destruction is blocked by a before_destroy. | ||||
| * | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-03-23 | 8 | -7/+36 |
| |\ | |||||
| | * | Update 'Getting Started on Windows' tip to go to one-click Rails Installer | Dr Nic Williams | 2011-03-22 | 1 | -1/+1 |
| | | | |||||
| | * | Caching guide: Capitalize 'Note' so that it's rendered as a proper note | Ryan Bigg | 2011-03-23 | 1 | -1/+1 |
| | | | |||||
| | * | Querying guide: mention that performing a where on an relation that contains ↵ | Ryan Bigg | 2011-03-22 | 1 | -1/+3 |
| | | | | | | | | | | | | an includes statement will generate a LEFT OUTER JOIN rather than an INNER JOIN or another query | ||||
| | * | Querying guide: mention that performing a where on an relation that contains ↵ | Ryan Bigg | 2011-03-22 | 1 | -0/+14 |
| | | | | | | | | | | | | an includes statement will generate a LEFT OUTER JOIN rather than an INNER JOIN or another query | ||||
| | * | Beef up Rails::Railtie::Configuration docs | Gabriel Horner | 2011-03-19 | 1 | -0/+8 |
| | | | |||||
| | * | remove bank line | Paco Guzman | 2011-03-18 | 1 | -1/+0 |
| | | | |||||
| | * | Add link to mailing-list | Nicolas Cavigneaux | 2011-03-16 | 1 | -1/+1 |
| | | | |||||
| | * | Remove incorrect comment that a default value of NULL cannot be set with ↵ | Manuel Meurer | 2011-03-16 | 1 | -3/+2 |
| | | | | | | | | | | | | change_column_default. | ||||
| | * | doc :anchor option for #match in routes | Gabriel Horner | 2011-03-15 | 1 | -0/+7 |
| | | | |||||
| * | | Fix test for prepend giving a false positive. [#5716 state:resolved] | Aditya Sanghi | 2011-03-23 | 2 | -3/+2 |
| | | | | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | | parse dates to yaml in json arrays | Diego Carrion | 2011-03-22 | 2 | -2/+4 |
| | | | | | | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
| * | | test json decoding with time parsing disabled with all backends and respect ↵ | Diego Carrion | 2011-03-22 | 2 | -7/+7 |
| | | | | | | | | | | | | | | | | | | ActiveSupport.parse_json_times when converting to yaml Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
| * | | use class_eval with a string when it's possible | Santiago Pastorino | 2011-03-22 | 3 | -7/+21 |
| | | | |||||
| * | | Allow to read and write AR attributes with non valid identifiers | Santiago Pastorino | 2011-03-22 | 4 | -2/+22 |
| | | | |||||
| * | | Do not in place modify what table_name returns | Santiago Pastorino | 2011-03-22 | 3 | -13/+2 |
| | | | |||||
| * | | Install rb-fsevent gem if ENV[RB_FSEVENT] is set | Piotr Sarnacki | 2011-03-22 | 1 | -0/+3 |
| | | | |||||
| * | | adding missing require | Aaron Patterson | 2011-03-22 | 1 | -0/+1 |
| | | | |||||
| * | | Merge branch 'master' into fuuu | Aaron Patterson | 2011-03-22 | 20 | -45/+256 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Do not show optional (.:format) block for wildcard route [#6605 state:resolved] pushing id insertion and prefetch primary keys down to Relation#insert use prepared statements to fetch the last insert id escaping binary data encoding when inserting to sqlite3. Thanks Naruse! [#6559 state:resolved] schemas set by set_table_name are respected by the mysql adapter. [#5322 state:resolved] Reapply extensions when using except and only SJIS is an alias to Windows-31J in ruby trunk. Use SHIFT_JIS for this test Improved resolver docs a bit [action_view] docs for FileSystemResolver [action_view] added custom patterns to template resolver | ||||
| | * | | Do not show optional (.:format) block for wildcard route [#6605 state:resolved] | Prem Sichanugrist | 2011-03-22 | 2 | -1/+8 |
| | | | | | | | | | | | | | | | | This will make the output of `rake routes` to be correctly match to the behavior of the application, as the regular expression used to match the path is greedy and won't capture the format part by default | ||||
| | * | | pushing id insertion and prefetch primary keys down to Relation#insert | Aaron Patterson | 2011-03-22 | 4 | -12/+23 |
| | | | | |||||
| | * | | use prepared statements to fetch the last insert id | Aaron Patterson | 2011-03-21 | 1 | -3/+4 |
| | | | | |||||
| * | | | Merge branch 'master' into nested_has_many_through | Jon Leighton | 2011-03-18 | 2 | -8/+69 |
| |\ \ \ | |||||
| * | | | | Add order clauses to fix some tests which were failing under 1.8 on oracle ↵ | Jon Leighton | 2011-03-18 | 2 | -14/+14 |
| | | | | | | | | | | | | | | | | | | | | and postgres | ||||
| * | | | | Merge branch 'master' into nested_has_many_through | Jon Leighton | 2011-03-16 | 30 | -81/+164 |
| |\ \ \ \ | |||||
| * | | | | | oracle, y u defy me | Jon Leighton | 2011-03-16 | 5 | -13/+15 |
| | | | | | | |||||
| * | | | | | Fix tests under postgres - we should always put conditions in the WHERE part ↵ | Jon Leighton | 2011-03-12 | 4 | -19/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | not in ON constraints because postgres requires that the table has been joined before the condition references it. | ||||
| * | | | | | Merge branch 'master' into nested_has_many_through | Jon Leighton | 2011-03-12 | 8 | -20/+117 |
| |\ \ \ \ \ | |||||
| * | | | | | | Resolve some TODO comments which I decided did not need anything done | Jon Leighton | 2011-03-12 | 3 | -9/+5 |
| | | | | | | | |||||
| * | | | | | | Simplify implementation of ThroughReflection#chain | Jon Leighton | 2011-03-11 | 2 | -23/+3 |
| | | | | | | | |||||
| * | | | | | | Abstract some common code from AssociationScope and ↵ | Jon Leighton | 2011-03-11 | 4 | -97/+83 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | JoinDependency::JoinAssociation into a JoinHelper module | ||||
| * | | | | | | Refactor JoinAssociation | Jon Leighton | 2011-03-10 | 1 | -100/+54 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'master' into nested_has_many_through | Jon Leighton | 2011-03-10 | 49 | -129/+231 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Rename Reflection#through_reflection_chain and #through_options to ↵ | Jon Leighton | 2011-03-10 | 5 | -50/+53 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reflection#chain and Reflection#options as they now no longer relate solely to through associations. | ||||
| * | | | | | | | Move the code which builds a scope for through associations into a generic ↵ | Jon Leighton | 2011-03-10 | 9 | -215/+162 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AssociationScope class which is capable of building a scope for any association. | ||||
| * | | | | | | | Merge branch 'master' into nested_has_many_through | Jon Leighton | 2011-03-07 | 25 | -44/+193 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix ↵ | Jon Leighton | 2011-03-07 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test_has_many_association_through_a_has_many_association_with_nonstandard_primary_keys | ||||
| * | | | | | | | | Referencing a table via the ON condition in a join should force that table ↵ | Jon Leighton | 2011-03-07 | 2 | -1/+27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to be eager-loaded via a JOIN rather than via subsequent queries. | ||||
| * | | | | | | | | Refactor ThroughAssociation#join_to to be much smaller, and independent of ↵ | Jon Leighton | 2011-03-06 | 2 | -84/+34 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | construct_owner_conditions. | ||||
| * | | | | | | | | Refactor ThroughAssociation#tables to just be a flat array of tables in the ↵ | Jon Leighton | 2011-03-06 | 1 | -75/+70 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | order that they should be joined together. | ||||
| * | | | | | | | | Merge branch 'master' into nested_has_many_through | Jon Leighton | 2011-03-05 | 63 | -117/+380 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/CHANGELOG | ||||
| * | | | | | | | | | Use Base#type_condition in JoinAssociation | Jon Leighton | 2011-03-05 | 2 | -17/+6 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Push source_type and polymorphic conditions out of ThroughAssociation and ↵ | Jon Leighton | 2011-03-05 | 4 | -47/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | JoinDependency::JoinAssociation and into the reflection instead. | ||||
| * | | | | | | | | | Add a test for STI on the through where the through is nested, and change ↵ | Jon Leighton | 2011-03-05 | 6 | -13/+46 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the code which support this |