Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Disable identity map by default. Detailed documentation will be pushed later. | José Valim | 2011-05-10 | 1 | -5/+0 |
| | |||||
* | use a null byte as a bind parameter substitute as it is not allowed in ↵ | Aaron Patterson | 2011-05-09 | 3 | -12/+59 |
| | | | | normal SQL. fixes #411, #417 | ||||
* | Merge pull request #471 from joshk/remove_as_concern | José Valim | 2011-05-09 | 1 | -2/+1 |
|\ | | | | | Removed an unneed AS::Concern from AR::IdentityMap | ||||
| * | removed an unneed AS::Concern from AR::IdentityMap | Josh Kalderimis | 2011-05-09 | 1 | -2/+1 |
|/ | |||||
* | Merge pull request #461 from chrislwade/sorted-migrations | José Valim | 2011-05-09 | 1 | -6/+6 |
|\ | | | | | Sorted migrations | ||||
| * | Interleave db_list and file_list. | Christopher Wade | 2011-05-09 | 1 | -6/+6 |
| | | |||||
| * | Sort migrations by the migration ID. | Christopher Wade | 2011-05-09 | 1 | -2/+2 |
| | | |||||
* | | Warn if we cannot verify CSRF token authenticity | José Valim | 2011-05-09 | 2 | -1/+6 |
| | | |||||
* | | Fix failing test. | José Valim | 2011-05-09 | 1 | -1/+1 |
| | | |||||
* | | xml_mini.rb:_dasherize() replacement 20 to 25% faster | Mike Howard | 2011-05-09 | 1 | -4/+3 |
| | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | | Oops, missing autoload, closes #466 | José Valim | 2011-05-09 | 1 | -0/+1 |
| | | |||||
* | | Merge pull request #460 from guilleiguaran/patch-1 | José Valim | 2011-05-09 | 1 | -1/+1 |
|\ \ | | | | | | | Just a minor fix in A.S CHANGELOG | ||||
| * | | Just a minor fix in A.S CHANGELOG | Guillermo Iguaran | 2011-05-08 | 1 | -1/+1 |
| |/ | |||||
* | | Optimize the most common resolver case. | José Valim | 2011-05-09 | 3 | -15/+28 |
| | | |||||
* | | No need for replace. | José Valim | 2011-05-09 | 1 | -12/+11 |
|/ | |||||
* | Merge pull request #451 from baroquebobcat/fixing_last_for_issue_371 | Jon Leighton | 2011-05-08 | 2 | -1/+27 |
|\ | |||||
| * | Fix for #371 | Nick Howard | 2011-05-08 | 2 | -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 Leighton | 2011-05-08 | 2 | -1/+5 |
| | | | | | | | | calculation queries. Fixes #406. | ||||
* | | Merge pull request #457 from vijaydev/master | José Valim | 2011-05-08 | 1 | -1/+3 |
|\ \ | | | | | | | Adds examples in code for ordinalizing negative numbers | ||||
| * | | adds code examples for negative ordinalize | Vijay Dev | 2011-05-08 | 1 | -1/+3 |
|/ / | |||||
* | | Merge pull request #332 from ↵ | Jon Leighton | 2011-05-08 | 5 | -2/+52 |
|\ \ | | | | | | | | | | cmeiklejohn/bug6230_optimistic_locking_double_quoted | ||||
| * | | Don't quote ID's as Arel will quote them -- follow same conventions as the ↵ | Christopher Meiklejohn | 2011-05-08 | 5 | -2/+52 |
|/ / | | | | | | | delete method. | ||||
* | | Merge pull request #445 from prakashmurthy/lighthouse_6334 | Aaron Patterson | 2011-05-08 | 1 | -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 ↵ | prakashmurthy | 2011-05-08 | 1 | -0/+10 |
| | | | | | | | | | | | | dasherized. | ||||
* | | | Merge pull request #455 from joshk/mass_assignment_roles | José Valim | 2011-05-08 | 6 | -64/+64 |
|\ \ \ | | | | | | | | | Renamed mass-assignment scopes to roles | ||||
| * | | | renamed mass-assignment scopes to roles, updated code, tests, docs and ↵ | Josh Kalderimis | 2011-05-08 | 6 | -64/+64 |
|/ / / | | | | | | | | | | security guide | ||||
* | | | Merge pull request #388 from smartinez87/remove_method | José Valim | 2011-05-08 | 1 | -2/+3 |
|\ \ \ | |/ / |/| | | Better use #remove_possible_method here | ||||
| * | | Better use #remove_possible_method here | Sebastian Martinez | 2011-05-08 | 1 | -2/+3 |
| | | | |||||
* | | | prepend the assets route instead of appending, closes #436 | José Valim | 2011-05-08 | 5 | -8/+37 |
| | | | |||||
* | | | Merge pull request #454 from dlee/nested_indifferent_access | José Valim | 2011-05-08 | 5 | -5/+35 |
|\ \ \ | | | | | | | | | indifferent access should recurse Hash subclasses | ||||
| * | | | indifferent access should recurse Hash subclasses | David Lee | 2011-05-08 | 5 | -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é Valim | 2011-05-08 | 1 | -3/+1 |
| | | | | |||||
* | | | | Merge pull request #420 from burke/master | José Valim | 2011-05-08 | 3 | -1/+14 |
|\ \ \ \ | |/ / / |/| | | | Accept single prefix in ActionView::MissingTemplate#initialize | ||||
| * | | | Added activesupport requires for Array.wrap in previously modified files | Burke Libbey | 2011-05-07 | 2 | -0/+3 |
| | | | | |||||
| * | | | Remove redundant check for is_a?(String) | Burke Libbey | 2011-05-06 | 2 | -2/+2 |
| | | | | |||||
| * | | | Added a test for MissingTemplate change, and changed to use Array.wrap() as | Burke Libbey | 2011-05-06 | 3 | -2/+11 |
| | | | | | | | | | | | | | | | | requested by josevalim. | ||||
| * | | | Made ActionView::MissingTemplate#initialize optionally accept a single string | Burke Libbey | 2011-05-06 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | prefix to be converted to an array as in ActionView::PathSet#find_all. | ||||
* | | | | Merge pull request #430 from dlee/methodoverride | José Valim | 2011-05-08 | 5 | -5/+53 |
|\ \ \ \ | | | | | | | | | | | Logs should show overridden method; Issue 426 | ||||
| * | | | | Logs should show overridden method; Issue 426 | David Lee | 2011-05-07 | 5 | -5/+53 |
| | | | | | |||||
* | | | | | Fix failing xml mini test. | José Valim | 2011-05-08 | 1 | -1/+4 |
| | | | | | |||||
* | | | | | Merge pull request #452 from jrom/runner-r-alias | José Valim | 2011-05-08 | 1 | -1/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | Add alias `r` for rails runner | ||||
| * | | | | | Add alias `r` for rails runner | Jordi Romero | 2011-05-07 | 1 | -1/+2 |
|/ / / / / | |||||
* | | | | | Merge pull request #449 from msgehard/rename_duplicate_test_methods | Santiago Pastorino | 2011-05-07 | 2 | -2/+2 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | Rename duplicate tests | ||||
| * | | | | Rename duplicate tests. There is now one failing test that was failing ↵ | Mike Gehard | 2011-05-07 | 2 | -2/+2 |
|/ / / / | | | | | | | | | | | | | before the rename but was never getting run. | ||||
* | | | | Merge pull request #442 from jasonnoble/namespace_fixtures | Aaron Patterson | 2011-05-07 | 8 | -318/+323 |
|\ \ \ \ | | | | | | | | | | | Namespace Fixtures in ActiveRecord | ||||
| * | | | | Added deprecation warning for Fixture(s) (Use ActiveRecord::Fixture(s)) | Jason Noble | 2011-05-07 | 1 | -0/+3 |
| | | | | | |||||
| * | | | | Namespace Fixtures in ActiveRecord | Jason Noble | 2011-05-07 | 8 | -318/+320 |
| | | | | | | | | | | | | | | | [Fixes #439] | ||||
* | | | | | Revert "Merge pull request #275 from pk-amooma/master" | José Valim | 2011-05-07 | 2 | -14/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Several AP tests fail after this change. This reverts commit aaf01cd53718c8aa5b69ac056b997e6dd9893777, reversing changes made to 9cc18c52faeebaad6a76bd62cdca1c6b9f96afed. | ||||
* | | | | | Always expand */* | José Valim | 2011-05-07 | 2 | -8/+5 |
| | | | | | |||||
* | | | | | Fixes ticket #6379. Improved the handling of Accept headers containing */*. | mathieuravaux | 2011-05-07 | 2 | -4/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `lookup_context#formats=` being too restrictive, "Accept: text/javascript, */*" resulted in [:js, "*/*"] formats instead of [:js, :html]. Signed-off-by: José Valim <jose.valim@gmail.com> |