aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* RouteSet: optimize routes generation when globbing is usedBogdan Gusiev2012-05-031-2/+5
* Merge pull request #6135 from alindeman/assert_redirect_to_with_regexpJosé Valim2012-05-033-13/+26
|\
| * Allows assert_redirected_to to accept a regular expressionAndy Lindeman2012-05-033-13/+26
|/
* Merge pull request #6139 from pwim/extract_options-actionpackJosé Valim2012-05-031-1/+2
|\
| * use extract_options!Paul McMahon2012-05-031-1/+2
* | Merge pull request #6141 from mhfs/mailer_tweeksJosé Valim2012-05-032-14/+2
|\ \
| * | No need to force conversion to Symbol since case ensures it's alreadyMarcelo Silveira2012-05-031-1/+1
| * | No need to work around 1.8 warnings anymore.Marcelo Silveira2012-05-031-13/+1
| |/
* | Merge pull request #6137 from FLOChip/cache_documentationVijay Dev2012-05-031-1/+1
|\ \ | |/ |/|
| * cache_store has an extra option of :null_store.Teng Siong Ong2012-05-031-1/+1
* | Merge pull request #6138 from bogdan/routesJosé Valim2012-05-031-19/+10
|\ \
| * | RouteSet: remove some code dupsBogdan Gusiev2012-05-021-19/+10
* | | Merge pull request #6134 from carlosantoniodasilva/ar-relation-kernel-private...Jon Leighton2012-05-033-2/+12
|\ \ \ | |_|/ |/| |
| * | Fix issue with private kernel methods and collection associations. Closes #2508Carlos Antonio da Silva2012-05-023-2/+12
|/ /
* | Add CHANGELOG entrySantiago Pastorino2012-05-021-0/+2
* | Merge pull request #6131 from schneems/schneems/routes_backtraceSantiago Pastorino2012-05-021-1/+3
|\ \
| * | Add backtrace to development routing error pageschneems2012-05-021-1/+3
* | | Merge pull request #5153 from mhfs/first_finder_fixAaron Patterson2012-05-025-9/+92
|\ \ \
| * | | Use arel nodes instead of raw sqlMarcelo Silveira2012-05-022-4/+7
| * | | Use Array#first instead of Array#[0]Marcelo Silveira2012-05-021-5/+5
| * | | Adding note about `first` and `take` to the changelogMarcelo Silveira2012-05-021-0/+6
| * | | Introducing `take` as a replacement to the old behavior of `first`Marcelo Silveira2012-05-023-3/+52
| * | | Document `last`, check for primary key on default order and use quoted table ...Marcelo Silveira2012-05-021-2/+5
| * | | Made `first` finder consistent among database engines by adding aMarcelo Silveira2012-05-022-2/+24
|/ / /
* / / Reset the request parameters after a constraints checkAndrew White2012-05-023-0/+25
|/ /
* | Merge pull request #6125 from ncri/masterJosé Valim2012-05-022-3/+36
|\ \
| * | added proc evaluation for action cache's layout parameterNico2012-05-022-3/+36
* | | Merge pull request #6122 from amerine/add_fetch_to_actiondispatch_http_headersAaron Patterson2012-05-022-7/+13
|\ \ \
| * | | Enable ActionDispatch::Http::Headers to support fetchMark Turner2012-05-022-7/+13
| |/ /
* | | * move exception message to exception constructorAaron Patterson2012-05-021-5/+11
* | | Merge pull request #3707 from ebeigarts/refactor_remove_columnPiotr Sarnacki2012-05-024-6/+4
|\ \ \ | |/ / |/| |
| * | Refactored remove_columnEdgars Beigarts2012-05-024-6/+4
* | | Merge pull request #6119 from romanvbabenko/refactor/checking_rubygems_presenceJeremy Kemper2012-05-022-19/+15
|\ \ \
| * | | Gem cont presence checking has been removedRoman V. Babenko2012-05-022-19/+15
* | | | Merge pull request #6116 from romanvbabenko/refactor/executable_rakefilesJeremy Kemper2012-05-029-8/+0
|\ \ \ \
| * | | | Rakefile executable attributes and shebang lines has been removedRoman V. Babenko2012-05-029-8/+0
| |/ / /
* | | | Merge pull request #6121 from bogdan/routesJosé Valim2012-05-021-26/+4
|\ \ \ \ | | |_|/ | |/| |
| * | | ActionPack routes: remove some useless code.Bogdan Gusiev2012-05-021-26/+4
|/ / /
* | | Merge pull request #6120 from arunagw/build_fix_master_railtiesJosé Valim2012-05-022-3/+3
|\ \ \
| * | | Fix build for railties generators Arun Agrawal2012-05-022-3/+3
|/ / /
* | | Merge pull request #6118 from arunagw/build_fix_masterJosé Valim2012-05-021-2/+2
|\ \ \ | |/ / |/| |
| * | build fix for SharedGeneratorTestsArun Agrawal2012-05-021-2/+2
|/ /
* | Merge pull request #6040 from Paymium/issue-6033José Valim2012-05-023-1/+28
|\ \
| * | BigDecimal string wrapping in JSON serialization can now be opted-out, fixes ...David FRANCOIS2012-05-023-1/+28
| |/
* | Merge pull request #5962 from bogdan/routesJosé Valim2012-05-021-18/+0
|\ \
| * | ActionPack: remove tests for hash_for_* methodsBogdan Gusiev2012-05-021-18/+0
| |/
* | Merge pull request #6111 from oscardelben/new_hash_syntax_in_gemfileJosé Valim2012-05-021-14/+14
|\ \ | |/ |/|
| * Use new hash syntax in generated GemfileOscar Del Ben2012-05-021-14/+14
|/
* Merge pull request #6109 from carlosantoniodasilva/fix-buildSantiago Pastorino2012-05-011-2/+2
|\
| * Build fix for plugin new generator changeCarlos Antonio da Silva2012-05-011-2/+2
|/