aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | fix doc [ci skip]Vijay Dev2012-05-041-1/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | session creation methods to a moduleAaron Patterson2012-05-043-24/+11
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge pull request #6154 from shaliko/patch-1Vijay Dev2012-05-041-1/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | Update documentation for button_to.
| | * | | | | | | | | | | | Update documentation for button_to.Shalva Usubov2012-05-041-1/+6
| | |/ / / / / / / / / / /
| * | | | | | | | | | | | update invalid partial error message as per ↵Vijay Dev2012-05-041-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 04202a3f8d66c0675eac41fbf63309f4be356e81
| * | | | | | | | | | | | Merge pull request #6159 from marcandre/fix_bad_partial_error_messVijay Dev2012-05-041-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adjust error message for partial names starting with an uppercase letter...
| | * | | | | | | | | | | | Adjust error message for partial names starting with an uppercase letter.Marc-Andre Lafortune2012-05-041-2/+2
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | create a request session in the cookie storesAaron Patterson2012-05-041-0/+8
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | create a request::session object in the memecache store middlewareAaron Patterson2012-05-041-0/+10
| |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge branch 'master' into sessionAaron Patterson2012-05-0467-853/+881
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (55 commits) extract deprecated dynamic methods Add some docs and changelog entry Allow overriding exception handling in threaded consumer Allow configuring a different queue consumer actually don't need to expand the aggregates at all #to_sym is unnecessary de-globalise method extract code from AR::Base clean up implementation of dynamic methods. use method compilation etc. Fix ActiveModel README example mention database mapping in getting started guide Remove vestiges of the http_only! config from configuring guide Remove content-length as well Make ActionController#head pass rack-link RouteSet: optimize routes generation when globbing is used Allows assert_redirected_to to accept a regular expression use extract_options! No need to force conversion to Symbol since case ensures it's already one. No need to work around 1.8 warnings anymore. Update command line guide ...
| | * | | | | | | | | | | extract deprecated dynamic methodsJon Leighton2012-05-042-142/+40
| | | | | | | | | | | | |
| | * | | | | | | | | | | Merge pull request #6153 from carlosantoniodasilva/queue-consumerJosé Valim2012-05-048-23/+89
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | Configurable queue consumer
| | | * | | | | | | | | | Add some docs and changelog entryCarlos Antonio da Silva2012-05-043-13/+21
| | | | | | | | | | | | |
| | | * | | | | | | | | | Allow overriding exception handling in threaded consumerCarlos Antonio da Silva2012-05-042-1/+24
| | | | | | | | | | | | |
| | | * | | | | | | | | | Allow configuring a different queue consumerCarlos Antonio da Silva2012-05-044-9/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also make sure to not use default queue consumer with custom queue implementation. It is up to the new queue implementation to start / shutdown the consumer.
| | * | | | | | | | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-0420-377/+150
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| | | * | | | | | | | | | Fix ActiveModel README exampleAlexey Vakhov2012-05-041-1/+1
| | | | | | | | | | | | |
| | * | | | | | | | | | | Merge pull request #5650 from sekrett/masterVijay Dev2012-05-041-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation fix: Change the example for habtm association to use proc according to changelog
| | | * | | | | | | | | | | Change the example for habtm association to use proc according to changelogAlexander Zubkov2012-03-291-1/+1
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | actually don't need to expand the aggregates at allJon Leighton2012-05-041-11/+1
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | #to_sym is unnecessaryJon Leighton2012-05-041-3/+3
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | de-globalise methodJon Leighton2012-05-043-9/+6
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | extract code from AR::BaseJon Leighton2012-05-043-35/+31
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | clean up implementation of dynamic methods. use method compilation etc.Jon Leighton2012-05-048-322/+204
| | | |_|_|_|/ / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Merge pull request #6148 from twinturbo/head-fixJosé Valim2012-05-032-1/+87
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make ActionController#head pass rack-link
| | | * | | | | | | | | | | Remove content-length as welltwinturbo2012-05-032-2/+9
| | | | | | | | | | | | | |
| | | * | | | | | | | | | | Make ActionController#head pass rack-linktwinturbo2012-05-032-1/+80
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Merge pull request #5821 from Deradon/fix-engine-tasksPiotr Sarnacki2012-05-032-1/+37
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provided fix for calling rake tasks within mountable engines
| | | * | | | | | | | | | | | Provided fix for calling rake tasks within mountable enginesPatrick Helm2012-04-122-1/+37
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge pull request #4452 from tapajos/e5425c8f68fbb720fcbf4b14e1f154ac27dbbbedAaron Patterson2012-05-032-1/+8
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix cache (FileStore) clear to keep .gitkeep.
| | | * | | | | | | | | | | | | Cache (FileStore) clear should keep .gitkeepMarcos Tapajos2012-01-132-1/+8
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge pull request #6012 from avakhov/dbconsole-testPiotr Sarnacki2012-05-032-22/+162
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cover Rails::DBConsole with tests
| | | * | | | | | | | | | | | | | Add Rails::DBConsole testsAlexey Vakhov2012-05-022-22/+162
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Merge pull request #4496 from makeable/masterAaron Patterson2012-05-031-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Active Support Cache - race_condition_ttl should be an integer
| | | * | | | | | | | | | | | | | | race_condition_ttl should be an integerMatt Williams2012-01-171-1/+1
| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | 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.