aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #6144 from bogdan/routesJosé Valim2012-05-031-2/+5
|\ | | | | RouteSet: optimize routes generation when globbing is used
| * 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 expression
| * 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!
| * use extract_options!Paul McMahon2012-05-031-1/+2
| |
* | Merge pull request #6141 from mhfs/mailer_tweeksJosé Valim2012-05-032-14/+2
|\ \ | | | | | | Minor ActionMailer tweaks
| * | No need to force conversion to Symbol since case ensures it's alreadyMarcelo Silveira2012-05-031-1/+1
| | | | | | | | | | | | one.
| * | 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.
| * 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 dups
| * | RouteSet: remove some code dupsBogdan Gusiev2012-05-021-19/+10
| | |
* | | Merge pull request #6134 from ↵Jon Leighton2012-05-033-2/+12
|\ \ \ | |_|/ |/| | | | | | | | carlosantoniodasilva/ar-relation-kernel-private-methods Fix issue with private kernel methods and collection associations
| * | Fix issue with private kernel methods and collection associations. Closes #2508Carlos Antonio da Silva2012-05-023-2/+12
|/ / | | | | | | | | | | | | | | Change CollectionProxy#method_missing to use scoped.public_send, to avoid a problem described in issue #2508 when trying to use class methods with names like "open", that clash with private kernel methods. Also changed the dynamic matcher instantiator to send straight to scoped, to avoid another roundtrip to method_missing.
* | 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 page
| * | Add backtrace to development routing error pageschneems2012-05-021-1/+3
| | | | | | | | | | | | | | | | | | If a user gets a routing error due to a view helper such as using user_path without an :id they must go to their logs to see the backtrace. By adding in the trace template, a user can see which line the error occurred on without leaving the browser. When a routing error occurs outside of the view the application trace will be blank and will not confuse developers.
* | | Merge pull request #5153 from mhfs/first_finder_fixAaron Patterson2012-05-025-9/+92
|\ \ \ | | | | | | | | Made `first` finder consistent among database engines by adding a default order
| * | | 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
| | | | | | | | | | | | | | | | and column names
| * | | Made `first` finder consistent among database engines by adding aMarcelo Silveira2012-05-022-2/+24
|/ / / | | | | | | | | | default order clause (fixes #5103)
* / / Reset the request parameters after a constraints checkAndrew White2012-05-023-0/+25
|/ / | | | | | | | | | | | | | | | | | | | | | | | | A callable object passed as a constraint for a route may access the request parameters as part of its check. This causes the combined parameters hash to be cached in the environment hash. If the constraint fails then any subsequent access of the request parameters will be against that stale hash. To fix this we delete the cache after every call to `matches?`. This may have a negative performance impact if the contraint wraps a large number of routes as the parameters hash is built by merging GET, POST and path parameters. Fixes #2510.
* | Merge pull request #6125 from ncri/masterJosé Valim2012-05-022-3/+36
|\ \ | | | | | | Adding proc evaluation for action caching layout parameter
| * | 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 fetch
| * | | Enable ActionDispatch::Http::Headers to support fetchMark Turner2012-05-022-7/+13
| |/ /
* | | * move exception message to exception constructorAaron Patterson2012-05-021-5/+11
| | | | | | | | | | | | | | | * save original exception * keep original backtrace
* | | Merge pull request #3707 from ebeigarts/refactor_remove_columnPiotr Sarnacki2012-05-024-6/+4
|\ \ \ | |/ / |/| | Refactored remove_column
| * | Refactored remove_columnEdgars Beigarts2012-05-024-6/+4
| | |
* | | Merge pull request #6119 from romanvbabenko/refactor/checking_rubygems_presenceJeremy Kemper2012-05-022-19/+15
|\ \ \ | | | | | | | | Gem const presence checking has been removed
| * | | 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 removed
| * | | | 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.
| * | | 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
| * | | 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 SharedGeneratorTests
| * | 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
| * | BigDecimal string wrapping in JSON serialization can now be opted-out, fixes ↵David FRANCOIS2012-05-023-1/+28
| |/ | | | | | | #6033
* | Merge pull request #5962 from bogdan/routesJosé Valim2012-05-021-18/+0
|\ \ | | | | | | Remove tests for undocumented private methods
| * | 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 Gemfile
| * 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 change