aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Updated guide authors.txt with Heiko's bioHeiko Webers2008-11-021-0/+6
|
* fixes a typoXavier Noria2008-11-021-1/+1
|
* Merge commit 'mainstream/master'Pratik Naik2008-11-022-6/+4
|\
| * Dont document internalsPratik Naik2008-11-021-3/+0
| |
| * Merge docrails. Remove unnecessary files.Pratik Naik2008-11-024-46728/+8
| |
| * Backwards compatibility fixes for relative_url_rootMichael Koziarski2008-11-022-6/+4
| | | | | | | | | | * Make the old deprecated relative_url_root still set the value as it's still used by mongrel * Set the default from the ENV value when the file is required, not at runtime.
| * Merge with docrailsPratik Naik2008-11-0226-611/+1096
| |
* | Revert "Added information about @performed_redirect for redirect_to calls."Pratik Naik2008-11-021-3/+0
| | | | | | | | | | | | This reverts commit 712e8ed2aa7b6e656d458f8e4121fb6063d4ae6e. REASON : No need to document internals
* | Remove unnecessary filesPratik Naik2008-11-023-46728/+0
| |
* | Made more clear the case of ignored :limit option for eager loaded associationsLuca Guidi2008-11-021-0/+8
| |
* | Merge commit 'mainstream/master'Pratik Naik2008-11-0253-338/+697
|\| | | | | | | | | | | | | | | Conflicts: railties/doc/guides/html/layouts_and_rendering.html railties/doc/guides/source/active_record_basics.txt railties/doc/guides/source/layouts_and_rendering.txt
| * Cleaned up route optimisation guard condition generation code as it was ↵Tom Lea2008-11-012-7/+32
| | | | | | | | | | | | | | | | getting a little messy. Add additional condition to handle the case where default_url_options is only defined in the controller, not the view. Signed-off-by: Michael Koziarski <michael@koziarski.com>
| * Make refresh_specs more resilient. Always add vendor/gems to gem search ↵Matt Jones2008-11-013-14/+27
| | | | | | | | | | | | path. Use Gem.clear_paths to ensure we get a current searcher. Signed-off-by: Michael Koziarski <michael@koziarski.com>
| * Simplified the logging format for parameters (don't include controller, ↵David Heinemeier Hansson2008-11-012-6/+25
| | | | | | | | action, and format as duplicates) [DHH]
| * Merge branch 'master' of git@github.com:rails/railsDavid Heinemeier Hansson2008-11-010-0/+0
| |\
| | * Make sure habtm use class variable to list association valid keysLuca Guidi2008-11-011-9/+12
| | | | | | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1310 state:committed]
| * | Make sure habtm use class variable to list association valid keysLuca Guidi2008-11-012-10/+14
| |/ | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1310 state:committed]
| * Remove the logging of the Session ID when the session store is CookieStore [DHH]David Heinemeier Hansson2008-11-012-1/+7
| |
| * Accidently nixed a doc headerDavid Heinemeier Hansson2008-11-011-0/+1
| |
| * Added render :js for people who want to render inline JavaScript replies ↵David Heinemeier Hansson2008-11-013-1/+35
| | | | | | | | without using RJS [DHH]
| * Really silence spec warnings when running GemDependency tests [#1308 ↵Jeffrey Hardy2008-10-311-3/+2
| | | | | | | | | | | | state:resolved] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
| * Merge branch 'master' of git@github.com:rails/railsDavid Heinemeier Hansson2008-10-313-28/+25
| |\
| | * Revert "config.load_paths should be frozen [#728 state:resolved]"Joshua Peek2008-10-301-1/+0
| | | | | | | | | | | | This reverts commit 2dcdcf1552748f331bf6f6194ffddabd837bcac9.
| | * It is not necessary to store QueryCache in a thread local since the cache is ↵Joshua Peek2008-10-301-27/+14
| | | | | | | | | | | | local to the connection object which is managed by the connection pool
| | * config.load_paths should be frozen [#728 state:resolved]Joshua Peek2008-10-301-0/+1
| | |
| | * Use database name in query cache thread local key [#1283 state:resolved]Joshua Peek2008-10-301-3/+2
| | |
| | * Ensure content type gets reset after render_to_string [#1182 state:resolved]Joshua Peek2008-10-302-0/+11
| | |
| * | Fixed the option merging in Array#to_xml [#1126 state:resolved]David Heinemeier Hansson2008-10-312-1/+3
| |/
| * Merge branch 'master' of git@github.com:rails/railsDavid Heinemeier Hansson2008-10-303-2/+6
| |\
| | * Dup local assigns for partial collections so nil values doesn't get ↵Joshua Peek2008-10-303-2/+6
| | | | | | | | | | | | overwritten [#1250 state:resolved]
| * | Fixed regex in redirect_to to fully support URI schemes [#1247 state:committed]Seth Fitzsimmons2008-10-303-1/+16
| |/ | | | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
| * Don't rely on string CoreExtensions in StringInquirer since it is sometimes ↵Tarmo Tänav2008-10-301-1/+1
| | | | | | | | | | | | expected to work before the core extension are loaded Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
| * Ensure indices don't flip order in schema.rb [#1266 state:committed]Jordi Bunster2008-10-302-6/+14
| | | | | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
| * Fixed plugin generator so that generated unit tests would subclass ↵Mathias Meyer2008-10-305-12/+18
| | | | | | | | | | | | ActiveSupport::TestCase, also introduced a helper script to reduce the needed require statements. [#1137 state:committed] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
| * Fixed that ActiveResource#post would post an empty string when it shouldn't ↵David Heinemeier Hansson2008-10-303-1/+8
| | | | | | | | be posting anything (Paolo Angelini) [#525 state:committed]
| * Update the default deprecation message to not promise that theres more info ↵David Heinemeier Hansson2008-10-301-2/+2
| | | | | | | | at the Rails site [#776 state:resolved]
| * Merge branch 'master' of git@github.com:rails/railsDavid Heinemeier Hansson2008-10-300-0/+0
| |\
| | * Update prototype to 1.6.0.3Luca Guidi2008-10-302-119/+223
| | | | | | | | | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
| * | Update non-gems distributions to use sqlite3 as the default, matching the ↵Christopher Currie2008-10-301-1/+1
| | | | | | | | | | | | | | | | | | "rails" command default [#1270 status:committed] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
| * | Update prototype to 1.6.0.3Luca Guidi2008-10-302-119/+223
| |/ | | | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
| * Make #destroy write 1 line into log (instead of 3) (Dmitry Sokurenko) [#689 ↵David Heinemeier Hansson2008-10-291-4/+5
| | | | | | | | status:committed]
| * Proper API for reloading translationsDavid Heinemeier Hansson2008-10-295-4/+16
| |
| * Ensure @content_for_* is checked before yielding to block in render :layout ↵Ryan Bates2008-10-284-1/+16
| | | | | | | | | | | | [#8994 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Remove reload call from vendored gem. Breaks a bunch of stuff as Dispatcher ↵Michael Koziarski2008-10-281-4/+0
| | | | | | | | | | | | isn't always defined. This call will be moved into Dispatcher in a bit.
| * A few more style changesDavid Heinemeier Hansson2008-10-281-4/+4
| |
| * Make I18n::Backend::Simple reload its translations in development mode [DHH]David Heinemeier Hansson2008-10-282-2/+14
| |
| * Follow style conventionsDavid Heinemeier Hansson2008-10-281-14/+14
| |
| * Merge branch 'master' of git@github.com:rails/railsDavid Heinemeier Hansson2008-10-286-14/+24
| |\
| | * Track rendered templates in stack so the current template can always be ↵Joshua Peek2008-10-285-7/+23
| | | | | | | | | | | | accessed. Added ActionView::Base#template to access the template object.
| | * Thread Safety: Ensure recognize_optimized is immediately written instead of ↵Joshua Peek2008-10-271-7/+1
| | | | | | | | | | | | lazily