aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merging 3.0.x CHANGELOGsGuillermo Iguaran2011-05-107-4/+280
|
* Update copyright year in Active Resource and Active SupportVijay Dev2011-05-092-2/+2
| | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* 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 ↵Aaron Patterson2011-05-093-12/+59
| | | | normal SQL. fixes #411, #417
* Merge pull request #471 from joshk/remove_as_concernJosé Valim2011-05-091-2/+1
|\ | | | | Removed an unneed AS::Concern from AR::IdentityMap
| * 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
|\ | | | | Sorted migrations
| * 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
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* | 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 CHANGELOG
| * | 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
| | | | | | | | | | | | | | | | | | | | | | | | if a query contains a limit or an offset, ActiveRecord::FinderMethods#find_last had inconsistent behavior. If the records were loaded, it returned the last record in the cached list. If they were not, it reversed the order of the query and changed the limit to one. If the earlier limit was less than the total matching the query in the db, it would return a different record than if the records had been cached. This commit changes find_last so that it loads the records when getting the last record on a query containing a limit or an offset, which makes the behavior consistent.
* | Ensure that ORDER BY clauses from default scopes are not included in ↵Jon Leighton2011-05-082-1/+5
| | | | | | | | calculation queries. Fixes #406.
* | Merge pull request #457 from vijaydev/masterJosé Valim2011-05-081-1/+3
|\ \ | | | | | | Adds examples in code for ordinalizing negative numbers
| * | adds code examples for negative ordinalizeVijay Dev2011-05-081-1/+3
|/ /
* | Merge pull request #332 from ↵Jon Leighton2011-05-085-2/+52
|\ \ | | | | | | | | | cmeiklejohn/bug6230_optimistic_locking_double_quoted
| * | Don't quote ID's as Arel will quote them -- follow same conventions as the ↵Christopher Meiklejohn2011-05-085-2/+52
|/ / | | | | | | delete method.
* | Merge pull request #445 from prakashmurthy/lighthouse_6334Aaron Patterson2011-05-081-0/+10
|\ \ | | | | | | Fix for Lighthouse ticket # 6334 : to_xml should render valid xml or raise an error all the time
| * | Lighthouse ticket # 6334; added tests to verify that spaces in key are ↵prakashmurthy2011-05-081-0/+10
| | | | | | | | | | | | dasherized.
* | | Merge pull request #455 from joshk/mass_assignment_rolesJosé Valim2011-05-086-64/+64
|\ \ \ | | | | | | | | Renamed mass-assignment scopes to roles
| * | | renamed mass-assignment scopes to roles, updated code, tests, docs and ↵Josh Kalderimis2011-05-086-64/+64
|/ / / | | | | | | | | | security guide
* | | Merge pull request #388 from smartinez87/remove_methodJosé Valim2011-05-081-2/+3
|\ \ \ | |/ / |/| | Better use #remove_possible_method here
| * | 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 subclasses
| * | | indifferent access should recurse Hash subclassesDavid Lee2011-05-085-5/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit makes Hash subclasses convert to HWIA by default for nested objects of subclasses of Hash, but allows certain subclasses to prevent nested conversion by introducing Hash#nested_under_indifferent_access that subclasses can overwrite. ActiveSupport::OrderedHash is one such subclass that overwrites +nested_under_indifferent_access+, since implicitly converting it to HWIA would remove the ordering of keys and values in Ruby 1.8. This change is necessary because commit ce9456e broke nested indifferent access conversion for all subclasses of Hash.
* | | | 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
|\ \ \ \ | |/ / / |/| | | Accept single prefix in ActionView::MissingTemplate#initialize
| * | | 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
| | | |
| * | | Added a test for MissingTemplate change, and changed to use Array.wrap() asBurke Libbey2011-05-063-2/+11
| | | | | | | | | | | | | | | | requested by josevalim.
| * | | Made ActionView::MissingTemplate#initialize optionally accept a single stringBurke Libbey2011-05-061-0/+1
| | | | | | | | | | | | | | | | prefix to be converted to an array as in ActionView::PathSet#find_all.
* | | | Merge pull request #430 from dlee/methodoverrideJosé Valim2011-05-085-5/+53
|\ \ \ \ | | | | | | | | | | Logs should show overridden method; Issue 426
| * | | | Logs should show overridden method; Issue 426David Lee2011-05-075-5/+53
| | | | |
* | | | | Fix failing xml mini test.José Valim2011-05-081-1/+4
| | | | |
* | | | | Merge pull request #452 from jrom/runner-r-aliasJosé Valim2011-05-081-1/+2
|\ \ \ \ \ | | | | | | | | | | | | Add alias `r` for rails runner
| * | | | | Add alias `r` for rails runnerJordi Romero2011-05-071-1/+2
|/ / / / /
* | | | | Merge pull request #449 from msgehard/rename_duplicate_test_methodsSantiago Pastorino2011-05-072-2/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | | Rename duplicate tests
| * | | | Rename duplicate tests. There is now one failing test that was failing ↵Mike Gehard2011-05-072-2/+2
|/ / / / | | | | | | | | | | | | before the rename but was never getting run.
* | | | Merge pull request #442 from jasonnoble/namespace_fixturesAaron Patterson2011-05-078-318/+323
|\ \ \ \ | | | | | | | | | | Namespace Fixtures in ActiveRecord
| * | | | Added deprecation warning for Fixture(s) (Use ActiveRecord::Fixture(s))Jason Noble2011-05-071-0/+3
| | | | |
| * | | | Namespace Fixtures in ActiveRecordJason Noble2011-05-078-318/+320
| | | | | | | | | | | | | | | [Fixes #439]
* | | | | Revert "Merge pull request #275 from pk-amooma/master"José Valim2011-05-072-14/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Several AP tests fail after this change. This reverts commit aaf01cd53718c8aa5b69ac056b997e6dd9893777, reversing changes made to 9cc18c52faeebaad6a76bd62cdca1c6b9f96afed.
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-30 01:45:21 +0000