aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Revert "Fix example using wrong method name"Pratik Naik2008-12-191-3/+3
* Merge commit 'mainstream/master'Pratik Naik2008-12-1955-1520/+1864
|\
| * Add repair_helper.rb file I forgot in previous commit 8a92cdPratik Naik2008-12-191-0/+50
| * Add a repair_helper to repair changes to the validations inside validations_t...Murray Steele2008-12-192-160/+195
| * Revert "Auto-load template handlers based on unmatched extensions [#1540 stat...Pratik Naik2008-12-192-27/+8
| * Cheaper metal cascadeJeremy Kemper2008-12-182-10/+51
| * Use LogTailerJeremy Kemper2008-12-181-1/+1
| * Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2008-12-1814-22/+170
| |\
| | * Fix preloading of has_one :through associations on belongs_to [#1507 state:re...Matt Jones2008-12-189-6/+52
| | * Free MySQL::Result objects after a call to execute [#1416 state:resolved]Manfred Stienstra2008-12-181-4/+13
| | * Don't include table_name twiceFrederick Cheung2008-12-181-1/+1
| | * Ensure :include checks joins when determining if it can preload [#528 state:r...Frederick Cheung2008-12-182-10/+98
| | * Add missing model files so tests can run isolated [#1506 state:resolved]Emilio Tagua2008-12-181-0/+3
| | * Fix preloading of belongs_to with null foreign key generating useless query [...Frederick Cheung2008-12-182-1/+3
| | * Make exceptions raise from find_by_foo! have a more helpful message [#1567 st...Frederick Cheung2008-12-181-1/+1
| * | Ensure rack.multithread is set back to original value. Accept external lock.Jeremy Kemper2008-12-181-10/+8
| * | No need to dup immutable optionsJeremy Kemper2008-12-181-1/+1
| * | Be sure to call superJeremy Kemper2008-12-181-0/+1
| * | Rename Rails::Rack::Logger -> LogTailer. Speed up log mtime checks.Jeremy Kemper2008-12-183-29/+36
| * | Cheaper log tail time comparisonJeremy Kemper2008-12-181-3/+3
| |/
| * Cleanup dispatch pathJoshua Peek2008-12-184-24/+16
| * Use more generic test env flagJoshua Peek2008-12-183-3/+3
| * Conditionally inject session middleware instead of using session managementJoshua Peek2008-12-185-41/+55
| * Move gaint lock into middlewareJoshua Peek2008-12-186-16/+44
| * Persistent session identifier support for CookieSessionStore and API compat. ...Lourens Naude2008-12-183-15/+63
| * Ensure error file is sent with a 'text/html' content type [#1478 state:resolved]Brady Bouchard2008-12-171-1/+1
| * When checking for the wrong routing method, ensure the environment is passed ...Joshua Peek2008-12-171-1/+1
| * Fix metal testsJoshua Peek2008-12-171-7/+3
| * Make generated Metal bits a pure rack endpoint application (not middleware)Joshua Peek2008-12-173-19/+13
| * Decorate responses from Rack Middleware and Rails Metal for the purposes of i...Jesse Newland2008-12-172-10/+52
| * Remove set_cookie hack from rack response since we dont use cgi sessions anymoreJoshua Peek2008-12-162-5/+3
| * Remove CGI::Session memory leak patchJoshua Peek2008-12-161-5/+0
| * Session Fixation tests have been rolled into the session cookie testsJoshua Peek2008-12-161-84/+0
| * Introduce Rails MetalJoshua Peek2008-12-166-0/+60
| * Update documentation for default_scopeDaniel Luz2008-12-161-2/+2
| * normalize author names in changelogs [#1495 state:committed]Xavier Noria2008-12-166-1078/+1078
* | Merge branch 'master' of git@github.com:lifo/docrailsRyan Bigg2008-12-195-957/+525
|\ \
| * | Fix bad link in Getting Started, rebuild HTMLMike Gunderloy2008-12-175-957/+525
* | | Better documentation for options_from_collection_for_select.Ryan Bigg2008-12-191-5/+13
|/ /
* | Correct one instance of table syntax.Ryan Bigg2008-12-171-9/+9
* | Fixed up syntax errors.Ryan Bigg2008-12-171-6/+7
* | i18n guide: add note about #t and #l aliasesSven Fuchs2008-12-161-0/+8
* | i18n guide: add screenshots and explain localize methodSven Fuchs2008-12-166-8/+39
* | i18n guide: renumber footnotes (do i really need to do this manually?)Sven Fuchs2008-12-161-10/+8
* | i18n guide: add link to rails-i18n wiki about "How to encode the current loca...Sven Fuchs2008-12-161-1/+1
* | i18n guide: actually use footnotesSven Fuchs2008-12-161-8/+10
* | add quote from wikipedia about I18n and L10nSven Fuchs2008-12-161-1/+6
* | explain exceptions, exception_handler and :raise optionSven Fuchs2008-12-161-9/+38
* | explain changes of pluralization featureSven Fuchs2008-12-161-2/+2
* | explain purpose of interpolation featureSven Fuchs2008-12-161-1/+1