Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | skip the before_type_cast_on_datetime test entirely for mysql2 | Brian Lopez | 2010-08-02 | 1 | -17/+18 | |
| | | | ||||||
* | | | move reload after touch | Brian Lopez | 2010-08-02 | 1 | -1/+1 | |
| | | | ||||||
* | | | reload the owner model after update | Brian Lopez | 2010-08-02 | 1 | -0/+1 | |
| | | | ||||||
* | | | Merge branch 'master' into mysql2 | Brian Lopez | 2010-08-02 | 14 | -37/+146 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Bring returning back to ease migration. Remove duplicated logic. Eager loading an association should not change the count of children fix loading of different elements in array then int and string [#5036 state:resolved] Tidy up previous commit. test and fix collection_singular_ids= with string primary keys [#5125 state:resolved] Handle edge cases in the previous patch. Improved how AppGenerator generates the application name. It now detects the current app name whenever possible. This means that renaming the residing directory will not effect the app name generated by AppGenerator. ActiveModel::Errors json serialization to work as Rails 3b4 [#5254 state:resolved] Add missing require in ActiveSupport::HashWithIndifferentAccess [#5189 state:resolved] Add an internal (private API) after_touch callback. [#5271 state:resolved] added failing touch propagation test Makes rails destroy scaffold don't duplicate routes.draw do |map| |map| when using the deprecated syntax Failing test to check for route file corruption if legacy map parameter is used. [#5263 state:open] Corrected the rake test:units and test:functionals description [#5251 state:committed] Use AS::OrderedHash when trusting in the order of the hash Fix label form helper to use I18n and html options, without the need of 'nil' text param: | |||||
| * | | Remove duplicated logic. | José Valim | 2010-08-02 | 1 | -7/+9 | |
| | | | ||||||
| * | | Eager loading an association should not change the count of children | Neeraj Singh | 2010-08-02 | 6 | -0/+42 | |
| | | | | | | | | | | | | | | | | | | [#4971 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
| * | | Tidy up previous commit. | José Valim | 2010-08-02 | 3 | -18/+16 | |
| | | | ||||||
| * | | test and fix collection_singular_ids= with string primary keys [#5125 ↵ | Robert Pankowecki | 2010-08-02 | 4 | -3/+46 | |
| | | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
| * | | Add an internal (private API) after_touch callback. [#5271 state:resolved] | José Valim | 2010-08-02 | 5 | -19/+24 | |
| | | | ||||||
| * | | added failing touch propagation test | Jakub Kuźma | 2010-08-02 | 2 | -0/+19 | |
| |/ | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
* / | update tests for mysql2 support | Brian Lopez | 2010-08-02 | 16 | -26/+466 | |
|/ | ||||||
* | Merge remote branch 'rails/master' | Xavier Noria | 2010-07-31 | 5 | -26/+29 | |
|\ | ||||||
| * | reverting where() functionality, adding a test | Aaron Patterson | 2010-07-30 | 2 | -4/+9 | |
| | | ||||||
| * | fewer method calls, using faster methods when possible | Aaron Patterson | 2010-07-30 | 1 | -5/+5 | |
| | | ||||||
| * | reducing function calls and using faster methods for testing | Aaron Patterson | 2010-07-30 | 2 | -16/+10 | |
| | | ||||||
| * | Don't increment and then decrement the same counter when re-assigning a ↵ | Tarmo Tänav | 2010-07-29 | 2 | -1/+5 | |
| | | | | | | | | | | | | | | | | belongs_to association [#2786 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | |||||
* | | returns not returned . fixing documentation for reflection | Neeraj Singh | 2010-07-30 | 1 | -28/+30 | |
|/ | ||||||
* | Merge remote branch 'rails/master' | Xavier Noria | 2010-07-30 | 14 | -28/+45 | |
|\ | ||||||
| * | edit pass to apply API guideline wrt the use of "# =>" in example code | Xavier Noria | 2010-07-30 | 2 | -3/+3 | |
| | | ||||||
| * | got the ternary backwards. somehow the sqlite tests passed! | Aaron Patterson | 2010-07-29 | 1 | -1/+1 | |
| | | ||||||
| * | PERF: avoiding splat args and reducing function calls | Aaron Patterson | 2010-07-29 | 1 | -8/+5 | |
| | | ||||||
| * | Revert "Avoid uneeded queries in session stores if sid is not given." | José Valim | 2010-07-29 | 1 | -0/+1 | |
| | | | | | | | | | | | | First step to merge Rails and Rack session stores. Rack always expects to receive the SID since it may have different behavior if the SID is nil. This reverts commit e210895ba95e498b9debbf43a3e5ae588bca81f0. | |||||
| * | Shouldn't have committed this! Revert "avoid calling to_sql twice" | Aaron Patterson | 2010-07-28 | 1 | -7/+4 | |
| | | | | | | | | This reverts commit 1c030a3c3c61d6d6262785bf67e1d8f44da87ea5. | |||||
| * | avoid calling to_sql twice | Aaron Patterson | 2010-07-28 | 1 | -4/+7 | |
| | | ||||||
| * | slight performance improvement when grabbing an arel table | Aaron Patterson | 2010-07-27 | 1 | -1/+1 | |
| | | ||||||
| * | fixed joining of attributes when using find_or_create_by with multiple ↵ | Jon Buda | 2010-07-28 | 2 | -1/+10 | |
| | | | | | | | | | | | | attributes through an association Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | |||||
| * | missing requires added | Santiago Pastorino | 2010-07-26 | 1 | -0/+2 | |
| | | ||||||
| * | Prep for RC | David Heinemeier Hansson | 2010-07-26 | 2 | -2/+2 | |
| | | ||||||
| * | Move runtime back to the Thread.current | José Valim | 2010-07-26 | 4 | -13/+21 | |
| | | ||||||
* | | moving time zone related documentation to timestamp.rb from base.rb | Neeraj Singh | 2010-07-29 | 2 | -13/+12 | |
| | | ||||||
* | | adding documentation regarding time_zone_aware_attributes and ↵ | Neeraj Singh | 2010-07-29 | 1 | -0/+13 | |
| | | | | | | | | skip_time_zone_conversion_for_attributes | |||||
* | | removed ambiguity from autosave description | Simon Tokumine | 2010-07-28 | 1 | -1/+1 | |
| | | ||||||
* | | adding punctuations | Neeraj Singh | 2010-07-28 | 1 | -4/+4 | |
| | | ||||||
* | | more documentation for update_attribute | Neeraj Singh | 2010-07-28 | 1 | -5/+6 | |
| | | ||||||
* | | Revert "Frameworks are loaded in application.rb rather than config.rb ↵ | Xavier Noria | 2010-07-27 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | according to Rails 3 conventions." This reverts commit 1793b21479d29ec29bd47c37ee68cb6ebdb71617. This commit had no risk, but docrails has a hard rule about touching code. The contribution is appreciated, I hope you do not mind this technical revert. I'll apply that to master with proper credit. | |||||
* | | Frameworks are loaded in application.rb rather than config.rb according to ↵ | Brian Smith | 2010-07-27 | 1 | -1/+1 | |
| | | | | | | | | Rails 3 conventions. | |||||
* | | adding comments to update_attribute method | Neeraj Singh | 2010-07-27 | 1 | -0/+4 | |
|/ | ||||||
* | No need to check for :uniq | Neeraj Singh | 2010-07-26 | 1 | -6/+3 | |
| | | | | | | [#5170 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
* | Removing unnecessary code [#5192 state:resolved] | Thiago Pradi | 2010-07-26 | 2 | -5/+7 | |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
* | Don't interpolate a blank string, avoid warnings | Santiago Pastorino | 2010-07-26 | 1 | -0/+2 | |
| | ||||||
* | Merge remote branch 'docrails/master' | Xavier Noria | 2010-07-26 | 3 | -193/+82 | |
|\ | ||||||
| * | Fixes syntax error in "with_scope" example | Arkadiusz Holko | 2010-07-25 | 1 | -1/+1 | |
| | | ||||||
| * | bringing consistency in comments | Neeraj Singh | 2010-07-24 | 1 | -14/+17 | |
| | | ||||||
| * | improve Active Record README | Mislav Marohnić | 2010-07-22 | 1 | -167/+55 | |
| | | | | | | | | | | | | | | - revise introductory text - improve examples - don't claim that Oracle, SQL Server, or DB2 are supported - remove lengthy "simple example" | |||||
| * | revise download/installation/support sections in READMEs | Mislav Marohnić | 2010-07-22 | 1 | -11/+9 | |
| | | | | | | | | | | | | | | - don't reference ancient gem versions - don't link to old API doc subdomains - point to GitHub instead of RubyForge - point to Lighthouse account for support | |||||
* | | do not execute the session tests within transactions | Aaron Patterson | 2010-07-25 | 1 | -0/+2 | |
| | | ||||||
* | | APIs for individual components are no longer published | Xavier Noria | 2010-07-26 | 1 | -6/+0 | |
| | | ||||||
* | | Object#returning removed | Santiago Pastorino | 2010-07-25 | 1 | -1/+1 | |
| | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
* | | Cache instrumenter again as per Aaron's patch. | José Valim | 2010-07-25 | 1 | -1/+2 | |
| | | ||||||
* | | Cache connection access. | José Valim | 2010-07-25 | 2 | -6/+4 | |
| | |