aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix previous commit by allowing a proc to be given as response_body. This is ...José Valim2011-05-103-34/+57
* Merge pull request #446 from danielstutzman/response_body_is_procJosé Valim2011-05-101-0/+38
|\
| * New test: setting response_body to a Proc should be supported.Daniel Stutzman2011-05-071-0/+38
* | Merge pull request #484 from slainer68/masterJosé Valim2011-05-102-0/+8
|\ \
| * | Puts ActiveRecord::SessionStore attributes in white list, fixes #483slainer682011-05-102-0/+8
|/ /
* | Merge pull request #482 from vijaydev/patch-2José Valim2011-05-101-2/+2
|\ \
| * | Fix typos in IM documentationVijay Dev2011-05-101-2/+2
|/ /
* | Document identity map inconsistency with associations, closes #474.José Valim2011-05-101-1/+28
* | Fix #480. Passing nil to create association works.José Valim2011-05-101-1/+1
* | Revert "b9ea751d0e56bd00d341766977a607ed3f7ddd0f".José Valim2011-05-101-26/+27
* | Add failing tests according to #479.José Valim2011-05-101-0/+15
* | Add failing tests, according to #480.José Valim2011-05-101-0/+14
* | Ensure assign_attributes and update_attributes do not fail on nil, closes #478.José Valim2011-05-103-0/+10
* | Add tests for content_for() for read, closes #475.José Valim2011-05-102-6/+18
* | Update copyright year in Active Resource and Active SupportVijay Dev2011-05-092-2/+2
* | Disable identity map by default. Detailed documentation will be pushed later.José Valim2011-05-101-5/+0
* | use a null byte as a bind parameter substitute as it is not allowed in normal...Aaron Patterson2011-05-093-12/+59
* | Merge pull request #471 from joshk/remove_as_concernJosé Valim2011-05-091-2/+1
|\ \
| * | removed an unneed AS::Concern from AR::IdentityMapJosh Kalderimis2011-05-091-2/+1
|/ /
* | Merge pull request #461 from chrislwade/sorted-migrationsJosé Valim2011-05-091-6/+6
|\ \
| * | Interleave db_list and file_list.Christopher Wade2011-05-091-6/+6
| * | Sort migrations by the migration ID.Christopher Wade2011-05-091-2/+2
* | | Warn if we cannot verify CSRF token authenticityJosé Valim2011-05-092-1/+6
* | | Fix failing test.José Valim2011-05-091-1/+1
* | | xml_mini.rb:_dasherize() replacement 20 to 25% fasterMike Howard2011-05-091-4/+3
* | | Oops, missing autoload, closes #466José Valim2011-05-091-0/+1
* | | Merge pull request #460 from guilleiguaran/patch-1José Valim2011-05-091-1/+1
|\ \ \
| * | | Just a minor fix in A.S CHANGELOGGuillermo Iguaran2011-05-081-1/+1
| |/ /
* | | Optimize the most common resolver case.José Valim2011-05-093-15/+28
* | | No need for replace.José Valim2011-05-091-12/+11
|/ /
* | Merge pull request #451 from baroquebobcat/fixing_last_for_issue_371Jon Leighton2011-05-082-1/+27
|\ \
| * | Fix for #371Nick Howard2011-05-082-1/+27
* | | Ensure that ORDER BY clauses from default scopes are not included in calculat...Jon Leighton2011-05-082-1/+5
* | | Merge pull request #457 from vijaydev/masterJosé Valim2011-05-081-1/+3
|\ \ \
| * | | adds code examples for negative ordinalizeVijay Dev2011-05-081-1/+3
|/ / /
* | | Merge pull request #332 from cmeiklejohn/bug6230_optimistic_locking_double_qu...Jon Leighton2011-05-085-2/+52
|\ \ \
| * | | Don't quote ID's as Arel will quote them -- follow same conventions as the de...Christopher Meiklejohn2011-05-085-2/+52
|/ / /
* | | Merge pull request #445 from prakashmurthy/lighthouse_6334Aaron Patterson2011-05-081-0/+10
|\ \ \
| * | | Lighthouse ticket # 6334; added tests to verify that spaces in key are dasher...prakashmurthy2011-05-081-0/+10
* | | | Merge pull request #455 from joshk/mass_assignment_rolesJosé Valim2011-05-086-64/+64
|\ \ \ \
| * | | | renamed mass-assignment scopes to roles, updated code, tests, docs and securi...Josh Kalderimis2011-05-086-64/+64
|/ / / /
* | | | Merge pull request #388 from smartinez87/remove_methodJosé Valim2011-05-081-2/+3
|\ \ \ \ | |/ / / |/| | |
| * | | Better use #remove_possible_method hereSebastian Martinez2011-05-081-2/+3
* | | | prepend the assets route instead of appending, closes #436José Valim2011-05-085-8/+37
* | | | Merge pull request #454 from dlee/nested_indifferent_accessJosé Valim2011-05-085-5/+35
|\ \ \ \
| * | | | indifferent access should recurse Hash subclassesDavid Lee2011-05-085-5/+35
* | | | | Revert to use === only here because of perf. :(José Valim2011-05-081-3/+1
* | | | | Merge pull request #420 from burke/masterJosé Valim2011-05-083-1/+14
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Added activesupport requires for Array.wrap in previously modified filesBurke Libbey2011-05-072-0/+3
| * | | | Remove redundant check for is_a?(String)Burke Libbey2011-05-062-2/+2