aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'mainstream/master'Pratik Naik2009-02-0313-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 Kemper2009-02-021-2/+7
| | | | | | | | public in included class
| * Don't assume ActiveRecord is availableJeremy Kemper2009-02-021-8/+13
| |
| * Added localized rescue (404.da.html) [#1835 state:committed]José Valim2009-02-024-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 Naik2009-02-021-1/+1
| | | | | | | | included
| * Mark CHANGELOGs for releaseDavid Heinemeier Hansson2009-02-016-5/+10
| |
| * Merge docrailsPratik Naik2009-02-0131-952/+4704
| |
* | regenerate guides HTMLXavier Noria2009-02-033-31/+97
| |
* | details and minor rewordings in Action Mailer guide up to section 2.2Xavier Noria2009-02-031-27/+23
| |
* | I18n guide: Correction -- Invalid .rb dictionaries will crash on first ↵Karel Minarik2009-02-021-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 Minarik2009-02-021-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 guideKarel Minarik2009-02-021-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 LineColin Curtin2009-02-021-3/+65
| |
* | Regenerate Guides HTMLMike Gunderloy2009-02-012-7/+70
| |
* | Add missing changelog entry to getting started guideMike Gunderloy2009-02-011-1/+1
| |
* | Update associations guide for 2.3Mike Gunderloy2009-02-011-20/+21
| |
* | Reword the docs for association_foreign_keyPratik Naik2009-02-011-5/+4
| |
* | Revert "A small addition to the fragment caching documentation"Pratik Naik2009-02-011-7/+0
| | | | | | | | | | | | This reverts commit 37fac27cd9bbd1a0e0a0325a87bbfa70cc7baa47. REASON : Needs to be reworded and put in the documentation of cache() method
* | Merge commit 'mainstream/master'Pratik Naik2009-02-0140-235/+1992
|\|
| * Add Rails Guides to the default links on generated index.html [#1839 ↵Mike Gunderloy2009-02-011-0/+1
| | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Add :reconnect option to generated mysql database.yml [#1838 state:resolved]Mike Gunderloy2009-02-011-0/+3
| | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Use Rack::Head middleware to ensure the body is discarded for HEAD requestsJoshua Peek2009-02-013-0/+18
| |
| * Remove ancient tests for CGI parsing bugJoshua Peek2009-01-311-30/+0
| |
| * Removed Prototype specific Safari 2 AJAX hack.Joshua Peek2009-01-312-7/+0
| | | | | | | | The normal null character stripper is still there.
| * Don't rely on the order in these testsMichael Koziarski2009-02-011-2/+2
| |
| * validate_length_of should use custom message if given when using in or within.miloops2009-02-012-5/+17
| | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1057 state:committed]
| * Removed map.resources :only/:except inheritanceTarmo Tänav2009-02-012-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 Duran2009-02-0121-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 Kemper2009-01-311-1/+5
| | | | | | | | String headers and bodies
| * Fix unsorted array comparisonJeremy Kemper2009-01-312-2/+2
| |
| * Ruby 1.9 compat: work around that String is not EnumerableJeremy Kemper2009-01-312-2/+6
| |
| * Make sure XmlMini is being correctly autoloaded by Ruby 1.9.1Luca Guidi2009-01-311-90/+92
| | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Ensure constant_watch_stack is protected by a mutex, so concurrent requires ↵Charles Nutter2009-01-301-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 Taylor2009-01-292-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 Gaffney2009-01-291-0/+58
| | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
* | Regenerate HTMLMike Gunderloy2009-02-012-63/+184
| |
* | Getting Started edit + 2.3 contentMike Gunderloy2009-02-013-29/+125
| |
* | Additional links on 2.3 release notesMike Gunderloy2009-02-011-0/+4
| |
* | Rebuild release note HTMLMike Gunderloy2009-01-311-16/+127
| |
* | Update 2.3 release notesMike Gunderloy2009-01-311-2/+76
| |
* | Regenerate guides htmlPratik Naik2009-01-313-32/+213
| |
* | Finalised first draft of Active Mailer Basics guideAhmed El-Daly2009-01-311-25/+159
| |
* | Getting rid of some of the pre-existent content in the AR basics guide, ↵CassioMarques2009-01-314-160/+127
| | | | | | | | adding new stuff to it.
* | Rebuild guides + relnotes HTMLMike Gunderloy2009-01-314-161/+455
| |
* | Update 2.3 release notes, plus one late change to 2.2 release notesMike Gunderloy2009-01-312-11/+72
| |
* | Make Partial example more clearPratik Naik2009-01-302-7/+7
| |
* | Remove core ppl from lead contributorsPratik Naik2009-01-302-99/+0
| |
* | Merge branch 'master' of git@github.com:lifo/docrailsAhmed El-Daly2009-01-2999-967/+3737
|\ \
| * | More text added to the active record basics guideCassioMarques2009-01-292-217/+102
| | |
| * | changed you to yourMike Gaffney2009-01-291-1/+1
| | |