Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of git@github.com:rails/rails | Jeremy Kemper | 2009-02-27 | 55 | -643/+910 |
|\ | |||||
| * | Vendorize i18n 0.1.3 gem (fixes issues with incompatible character encodings ↵ | Sven Fuchs | 2009-02-27 | 16 | -17/+52 |
| | | | | | | | | | | | | in Ruby 1.9) (Akira Matsuda) [#2038 state:committed] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
| * | Prep for RC2 later today | David Heinemeier Hansson | 2009-02-27 | 17 | -20/+25 |
| | | |||||
| * | 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> | ||||
| * | Metal can now line in plugins under app/metal [#2045 state:committed] | Matthew Rudy Jacobs | 2009-02-27 | 7 | -11/+40 |
| | | | | | | | | 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 | 7 | -10/+9 |
| | | | | | | | | state:resolved] | ||||
| * | Don't validate records of an :autosave association if they're marked for ↵ | Eloy Duran | 2009-02-27 | 2 | -7/+34 |
| | | | | | | | | | | | | destruction. [#2064 status:resolved] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
| * | Pass a custom form builder on to nested fields_for calls. [#2023 ↵ | Eloy Duran | 2009-02-27 | 3 | -49/+126 |
| | | | | | | | | | | | | status:committed] 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 | 9 | -535/+629 |
| | | | | | | | | [#1930 status:committed] | ||||
* | | Skip console test when using minitest | Jeremy Kemper | 2009-02-27 | 1 | -20/+22 |
| | | |||||
* | | Skip backtrace filter test when using minitest | Jeremy Kemper | 2009-02-27 | 1 | -20/+24 |
| | | |||||
* | | Ruby 1.9 compat: limit const_defined? | Jeremy Kemper | 2009-02-27 | 1 | -2/+6 |
| | | |||||
* | | Invoke tests with the same ruby | Jeremy Kemper | 2009-02-27 | 1 | -1/+2 |
|/ | |||||
* | Fix test failure introduced by 6099f261ea7c624aa45b47be7573ed1cab7b6b71 | Jeremy Kemper | 2009-02-25 | 1 | -1/+2 |
| | |||||
* | Test view path loading from the initializer. | Manfred Stienstra | 2009-02-25 | 1 | -2/+26 |
| | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | Test database middleware loading from the initializer. | Manfred Stienstra | 2009-02-25 | 2 | -10/+50 |
| | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | Add test case for ActiveRecord::ConnectionAdapters::ConnectionManagement. | Manfred Stienstra | 2009-02-25 | 1 | -0/+25 |
| | | | | | | - Make sure ConnectionManagement clears connections after each call, except in tests Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | Ruby 1.9 compat: silence a warning about regexp languages | Sam Granieri | 2009-02-25 | 1 | -1/+5 |
| | | | | | | [#2050 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | update the default scope test to take the model's default scope into account | rick | 2009-02-25 | 1 | -1/+1 |
| | |||||
* | Fixed bug that makes named_scopes _forgot_ current scope | Diego Algorta | 2009-02-25 | 3 | -2/+26 |
| | |||||
* | missed template fixtures with ~ | Joshua Peek | 2009-02-24 | 3 | -0/+3 |
| | |||||
* | Ensure ActiveRecord session store's connections are checked in after each ↵ | Joshua Peek | 2009-02-24 | 3 | -8/+31 |
| | | | | request [#1927 state:resolved] | ||||
* | Put back dispatcher cleanup call in console reload! [#2056 state:resolved] | Joshua Peek | 2009-02-24 | 1 | -0/+1 |
| | |||||
* | Just require tmail instead of autoloading it to fix issues when using the gem | Marcus Mateus | 2009-02-24 | 1 | -1/+2 |
| | | | | | version [#1851 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | Template without a known template handler should only be reachable through ↵ | thedarkone | 2009-02-24 | 2 | -8/+25 |
| | | | | | | its exact path. [#2027 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | correctly handle layouts for AJAX requests and regular js files [#2052 ↵ | Matt Jones | 2009-02-24 | 4 | -14/+24 |
| | | | | | | state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | Merge with docrails | Pratik Naik | 2009-02-24 | 44 | -1512/+2223 |
| | |||||
* | Update bundled memcache-client from 1.5.0.5 to 1.6.4.99. | Jeremy Kemper | 2009-02-23 | 3 | -131/+200 |
| | | | | See http://www.mikeperham.com/2009/02/15/memcache-client-performance/ | ||||
* | 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 | 5 | -1/+123 |
| | | | | batch processing [DHH/Jamis Buck] | ||||
* | load plugin view_paths to action_mailer view_paths and make action_mailer ↵ | Sven Fuchs | 2009-02-22 | 5 | -31/+39 |
| | | | | | | use them [#2031 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | Deprecated warnings for :skip_last_command and :connector of to_sentence ↵ | Guillermo Álvarez | 2009-02-22 | 2 | -5/+37 |
| | | | | | | [#1847 state:committed] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
* | Ensure that the app routes file is loaded even when engines are in play ↵ | David Heinemeier Hansson | 2009-02-22 | 1 | -1/+1 |
| | | | | (Thjis) [#1970 state:committed] | ||||
* | Don't depend on project.developers ordering | Jeremy Kemper | 2009-02-21 | 1 | -2/+2 |
| | |||||
* | Expected cookie value should also be escaped. | moro | 2009-02-21 | 1 | -1/+1 |
| | | | | | | | | Ruby 1.9 compat for test. [#1965 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Revert "Wrap calls to update_attributes in a transaction." | Michael Koziarski | 2009-02-22 | 2 | -49/+1 |
| | | | | | | | This caused failures on sqlite, sqlite3 and postgresql This reverts commit fc09ebc669bd58f415f7d3ef932ef02dab821ab5. [#922 state:reopened] | ||||
* | Fix requirements regexp for path segments | Andrew White | 2009-02-22 | 2 | -16/+36 |
| | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1772 state:committed] | ||||
* | Remove hardcoded number_of_capturesin ControllerSegment to allow regexp ↵ | Andrew White | 2009-02-22 | 2 | -4/+9 |
| | | | | | | | requirements with capturing parentheses Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1887 state:committed] | ||||
* | Wrap calls to update_attributes in a transaction. | Xavier Noria | 2009-02-22 | 2 | -1/+49 |
| | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#922 state:committed] | ||||
* | Update changelog for URI.unescape fix | Jeremy Kemper | 2009-02-20 | 1 | -0/+2 |
| | | | | [#2033 state:committed] | ||||
* | Broaden URI.unescape fix to all affected 1.9.x by checking for broken ↵ | Jeremy Kemper | 2009-02-20 | 2 | -11/+18 |
| | | | | behavior instead of specific patchlevel | ||||
* | fix test data, should specify encoding to use multibyte chars on Ruby 1.9 | moro | 2009-02-20 | 1 | -0/+1 |
| | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | URI.unescape fix removes the old unescape method | Jeremy Kemper | 2009-02-20 | 1 | -10/+7 |
| | |||||
* | Ruby 1.9.1p0's URI.decode() bug fix | moro | 2009-02-20 | 2 | -0/+24 |
| | | | | | | backport to fix Ruby 1.9.1p0 bug on [ruby-dev:38005]. Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | make action_controller/layouts pick templates from the current instance's ↵ | Sven Fuchs | 2009-02-20 | 3 | -32/+40 |
| | | | | | | view_paths instead of the class view_paths [#1974 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | break out of initializer early if gems aren't loaded [#1750 state:resolved] | Matt Jones | 2009-02-20 | 2 | -3/+7 |
| | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | Fix a failing mailer test. | thedarkone | 2009-02-20 | 1 | -1/+1 |
| | |||||
* | Move development mode reloading up the stack to avoid issues with class ↵ | Joshua Peek | 2009-02-20 | 6 | -22/+52 |
| | | | | reloading in middleware | ||||
* | Lazy evaluate middleware arguments [#2028 state:resolved] | Sven Fuchs | 2009-02-20 | 3 | -3/+16 |
| | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | Lazy evaluate ActionController session store middleware class to pickup ↵ | Joshua Peek | 2009-02-19 | 3 | -12/+14 |
| | | | | custom plugin session stores [#2001 state:resolved] |