Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'mainstream/master' | Pratik Naik | 2009-02-03 | 13 | -22/+74 |
|\ | | | | | | | | | | | | | | | | | | | Conflicts: railties/doc/guides/html/action_mailer_basics.html railties/doc/guides/html/getting_started_with_rails.html railties/doc/guides/html/i18n.html railties/doc/guides/source/action_mailer_basics.txt railties/doc/guides/source/getting_started_with_rails.txt railties/doc/guides/source/i18n.txt | ||||
| * | Workaround jruby issue with protected module attr_accessor showing up as ↵ | Jeremy Kemper | 2009-02-02 | 1 | -2/+7 |
| | | | | | | | | public in included class | ||||
| * | Don't assume ActiveRecord is available | Jeremy Kemper | 2009-02-02 | 1 | -8/+13 |
| | | |||||
| * | Added localized rescue (404.da.html) [#1835 state:committed] | José Valim | 2009-02-02 | 4 | -5/+42 |
| | | | | | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
| * | Template#mime_type should not use Mime::Type when Action Controller is not ↵ | Pratik Naik | 2009-02-02 | 1 | -1/+1 |
| | | | | | | | | included | ||||
| * | Mark CHANGELOGs for release | David Heinemeier Hansson | 2009-02-01 | 6 | -5/+10 |
| | | |||||
| * | Merge docrails | Pratik Naik | 2009-02-01 | 31 | -952/+4704 |
| | | |||||
* | | regenerate guides HTML | Xavier Noria | 2009-02-03 | 3 | -31/+97 |
| | | |||||
* | | details and minor rewordings in Action Mailer guide up to section 2.2 | Xavier Noria | 2009-02-03 | 1 | -27/+23 |
| | | |||||
* | | I18n guide: Correction -- Invalid .rb dictionaries will crash on first ↵ | Karel Minarik | 2009-02-02 | 1 | -1/+1 |
| | | | | | | | | request, not on app startup, due to lazy loading. Thanks @darktatka. | ||||
* | | I18n guide: Add warning about YAML sensitivity when storing translation in ↵ | Karel Minarik | 2009-02-02 | 1 | -0/+2 |
| | | | | | | | | | | | | YAML files, add info about better debugging when using Ruby files for translations: they crash your app during start-up. {i18n} Cf. http://groups.google.com/group/rails-i18n/browse_thread/thread/28f7aff5b8bd8c4d/002edd9466500302?hl=en and many many more other people wondering what's wrong with their YAML. | ||||
* | | Add link to Ryan Tomayko's "locale" Rack middleware to i18n guide | Karel Minarik | 2009-02-02 | 1 | -1/+1 |
| | | | | | | | | | | Part of rack-contrib suite: http://github.com/rtomayko/rack-contrib/blob/master/lib/rack/locale.rb | ||||
* | | Added the first part to the Rails Advanced Command Line | Colin Curtin | 2009-02-02 | 1 | -3/+65 |
| | | |||||
* | | Regenerate Guides HTML | Mike Gunderloy | 2009-02-01 | 2 | -7/+70 |
| | | |||||
* | | Add missing changelog entry to getting started guide | Mike Gunderloy | 2009-02-01 | 1 | -1/+1 |
| | | |||||
* | | Update associations guide for 2.3 | Mike Gunderloy | 2009-02-01 | 1 | -20/+21 |
| | | |||||
* | | Reword the docs for association_foreign_key | Pratik Naik | 2009-02-01 | 1 | -5/+4 |
| | | |||||
* | | Revert "A small addition to the fragment caching documentation" | Pratik Naik | 2009-02-01 | 1 | -7/+0 |
| | | | | | | | | | | | | This reverts commit 37fac27cd9bbd1a0e0a0325a87bbfa70cc7baa47. REASON : Needs to be reworded and put in the documentation of cache() method | ||||
* | | Merge commit 'mainstream/master' | Pratik Naik | 2009-02-01 | 40 | -235/+1992 |
|\| | |||||
| * | Add Rails Guides to the default links on generated index.html [#1839 ↵ | Mike Gunderloy | 2009-02-01 | 1 | -0/+1 |
| | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Add :reconnect option to generated mysql database.yml [#1838 state:resolved] | Mike Gunderloy | 2009-02-01 | 1 | -0/+3 |
| | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Use Rack::Head middleware to ensure the body is discarded for HEAD requests | Joshua Peek | 2009-02-01 | 3 | -0/+18 |
| | | |||||
| * | Remove ancient tests for CGI parsing bug | Joshua Peek | 2009-01-31 | 1 | -30/+0 |
| | | |||||
| * | Removed Prototype specific Safari 2 AJAX hack. | Joshua Peek | 2009-01-31 | 2 | -7/+0 |
| | | | | | | | | The normal null character stripper is still there. | ||||
| * | Don't rely on the order in these tests | Michael Koziarski | 2009-02-01 | 1 | -2/+2 |
| | | |||||
| * | validate_length_of should use custom message if given when using in or within. | miloops | 2009-02-01 | 2 | -5/+17 |
| | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1057 state:committed] | ||||
| * | Removed map.resources :only/:except inheritance | Tarmo Tänav | 2009-02-01 | 2 | -31/+47 |
| | | | | | | | | | | | | | | | | | | | | It's very rare for these options to apply identically to nested child resources, and with this inheritance on it's very difficult to have a child resource with more actions than the parent. This reverts commit 2ecec6052f7f290252a9fd9cc27ec804c7aad36c. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1826 state:committed] | ||||
| * | Add support for nested object forms to ActiveRecord and the helpers in ↵ | Eloy Duran | 2009-02-01 | 21 | -58/+1687 |
| | | | | | | | | | | | | | | | | ActionPack Signed-Off-By: Michael Koziarski <michael@koziarski.com> [#1202 state:committed] | ||||
| * | Ruby 1.9 compat: omit Rack::Lint from integration tests until it accepts ↵ | Jeremy Kemper | 2009-01-31 | 1 | -1/+5 |
| | | | | | | | | String headers and bodies | ||||
| * | Fix unsorted array comparison | Jeremy Kemper | 2009-01-31 | 2 | -2/+2 |
| | | |||||
| * | Ruby 1.9 compat: work around that String is not Enumerable | Jeremy Kemper | 2009-01-31 | 2 | -2/+6 |
| | | |||||
| * | Make sure XmlMini is being correctly autoloaded by Ruby 1.9.1 | Luca Guidi | 2009-01-31 | 1 | -90/+92 |
| | | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Ensure constant_watch_stack is protected by a mutex, so concurrent requires ↵ | Charles Nutter | 2009-01-30 | 1 | -5/+14 |
| | | | | | | | | | | | | | | | | do not corrupt it. [#1816 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Controller, response, and request should all refer to same session, even ↵ | Scott Taylor | 2009-01-29 | 2 | -4/+42 |
| | | | | | | | | | | | | after a call to session_reset [#1823 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| * | Deprecation tests for f17c876 [#1801 state:resolved] | Mike Gaffney | 2009-01-29 | 1 | -0/+58 |
| | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | | Regenerate HTML | Mike Gunderloy | 2009-02-01 | 2 | -63/+184 |
| | | |||||
* | | Getting Started edit + 2.3 content | Mike Gunderloy | 2009-02-01 | 3 | -29/+125 |
| | | |||||
* | | Additional links on 2.3 release notes | Mike Gunderloy | 2009-02-01 | 1 | -0/+4 |
| | | |||||
* | | Rebuild release note HTML | Mike Gunderloy | 2009-01-31 | 1 | -16/+127 |
| | | |||||
* | | Update 2.3 release notes | Mike Gunderloy | 2009-01-31 | 1 | -2/+76 |
| | | |||||
* | | Regenerate guides html | Pratik Naik | 2009-01-31 | 3 | -32/+213 |
| | | |||||
* | | Finalised first draft of Active Mailer Basics guide | Ahmed El-Daly | 2009-01-31 | 1 | -25/+159 |
| | | |||||
* | | Getting rid of some of the pre-existent content in the AR basics guide, ↵ | CassioMarques | 2009-01-31 | 4 | -160/+127 |
| | | | | | | | | adding new stuff to it. | ||||
* | | Rebuild guides + relnotes HTML | Mike Gunderloy | 2009-01-31 | 4 | -161/+455 |
| | | |||||
* | | Update 2.3 release notes, plus one late change to 2.2 release notes | Mike Gunderloy | 2009-01-31 | 2 | -11/+72 |
| | | |||||
* | | Make Partial example more clear | Pratik Naik | 2009-01-30 | 2 | -7/+7 |
| | | |||||
* | | Remove core ppl from lead contributors | Pratik Naik | 2009-01-30 | 2 | -99/+0 |
| | | |||||
* | | Merge branch 'master' of git@github.com:lifo/docrails | Ahmed El-Daly | 2009-01-29 | 99 | -967/+3737 |
|\ \ | |||||
| * | | More text added to the active record basics guide | CassioMarques | 2009-01-29 | 2 | -217/+102 |
| | | | |||||
| * | | changed you to your | Mike Gaffney | 2009-01-29 | 1 | -1/+1 |
| | | |