aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Updating guides to new rails initialization processMikel Lindsaar2010-06-044-7/+7
* Changing command line API from 'rails blog' to 'rails new blog'.Mikel Lindsaar2010-06-044-5/+15
* Properly cache association_collection#scopes calls having argumentsPratik Naik2010-06-043-1/+16
* Merge branch 'master' of github.com:rails/railsDavid Heinemeier Hansson2010-06-021-2/+1
|\
| * Add an asset_host accessor for consistency.José Valim2010-06-021-2/+1
* | Missed the extractionDavid Heinemeier Hansson2010-06-021-0/+9
|/
* Extract assets paths and make them available to Action Mailer as wellDavid Heinemeier Hansson2010-06-024-1/+13
* Merge branch 'master' of github.com:rails/railsDavid Heinemeier Hansson2010-06-0225-58/+133
|\
| * Changes made while working on upgrading cells to Rails 3wycats2010-06-025-4/+8
| * Merge branch 'master' of github.com:rails/railswycats2010-06-0241-104/+316
| |\
| | * Special treatement for Relation#select { with block }Pratik Naik2010-06-022-1/+19
| | * Configure generators before invoking.José Valim2010-06-021-0/+1
| | * Still copy application configuration to generator even if they are required e...José Valim2010-06-025-16/+13
| | * Merge remote branch 'docrails/master'Xavier Noria2010-06-025-13/+42
| | |\
| | | * AS guide: documents String#truncateXavier Noria2010-06-021-0/+33
| | | * AR validations & callbacks: update callbacks listeparreno2010-05-311-9/+5
| | | * add <%= to fields_for exampleseparreno2010-05-283-4/+4
| | * | revises the documentation of String#truncate and the truncate helperXavier Noria2010-06-022-22/+18
| | * | Add lib to load paths when application is inherited to be able to load lib co...José Valim2010-06-023-1/+29
| * | | Update CHANGELOGwycats2010-05-302-1/+3
* | | | You need the ruby-debug available in your Gemfile for debugger to workDavid Heinemeier Hansson2010-06-022-1/+4
| |/ / |/| |
* | | Merge branch 'master' of github.com:rails/railsDavid Heinemeier Hansson2010-06-0114-21/+44
|\ \ \
| * | | revises rdoc of AMo::Error#add [#4738 state:resolved]Xavier Noria2010-06-011-6/+6
| * | | Unforce text-format from AMSantiago Pastorino2010-06-014-7/+10
| * | | Unforce memcache from ASSantiago Pastorino2010-06-013-3/+9
| * | | Unforce builder from ASSantiago Pastorino2010-06-016-3/+10
| * | | Unforce tzinfo from ASSantiago Pastorino2010-06-014-2/+9
* | | | Extracted String#truncate from TextHelper#truncate [DHH]David Heinemeier Hansson2010-06-014-11/+69
|/ / /
* | | Base options cant live in lazy loaded helpers as they then wont be available ...David Heinemeier Hansson2010-05-312-7/+4
* | | Unforce i18n from ASSantiago Pastorino2010-05-316-6/+19
* | | rack-test version updated and removed from GemfileSantiago Pastorino2010-05-312-2/+1
* | | Add :only and :except to controllers MiddlewareStack. This allowsJosé Valim2010-05-303-18/+71
|/ /
* | Update template to allow handlers to more cleanly handle encodings (ht: nex3)wycats2010-05-304-69/+78
* | Remove the laziness from the middleware stack.José Valim2010-05-299-106/+51
* | Now that we always return a proxy from mb_chars, even in 1.9, all Strings com...wycats2010-05-291-3/+5
* | fix translation test in actionpack [#4701 state:commited]Santiago Pastorino2010-05-291-1/+1
* | Removing Metal from Rails 3. wycats2010-05-2920-319/+9
* | Merge commit 'mislav/counter_cache'Michael Koziarski2010-05-293-63/+95
|\ \
| * | fix `reset_counters` to work even with complex class namesMislav Marohnić2010-05-242-4/+31
| * | move counter_cache tests to a separate file and refactorMislav Marohnić2010-05-242-49/+58
| * | cleanup `update/reset_counters`: less SQL strings, more ActiveRecord/ArelMislav Marohnić2010-05-241-12/+8
* | | Merge commit 'mislav/auto_link'Michael Koziarski2010-05-292-30/+61
|\ \ \
| * | | avoid auto_linking already linked emails; more robust detection of linked URLsMislav Marohnić2010-05-242-16/+48
| * | | auto_link: support arbitrary URI schemes like "ftp:" and "file:"Mislav Marohnić2010-05-242-14/+13
| |/ /
* | | performance and integration tests inherit from AD, not ACGonçalo Silva2010-05-282-2/+2
* | | Use I18n 0.4.0José Valim2010-05-271-1/+1
| |/ |/|
* | Merge remote branch 'rails/master'Xavier Noria2010-05-2754-1020/+1120
|\ \
| * | In AV::TC, move protect_against_forgery? from the test_case to theDavid Chelimsky2010-05-262-4/+24
| * | reorganize tests for AV::TCDavid Chelimsky2010-05-261-140/+138
| * | Adding to_key to ActiveResource objects using ActiveModel::Conversion [#4685 ...Elomar França2010-05-262-5/+8