aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
* | 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.
* | Merge pull request #430 from dlee/methodoverrideJosé Valim2011-05-081-0/+1
|\ \ | | | | | | Logs should show overridden method; Issue 426
| * | Logs should show overridden method; Issue 426David Lee2011-05-071-0/+1
| | |
* | | Fix failing xml mini test.José Valim2011-05-081-1/+4
| | |
* | | 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.
* | | 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.
* | | xml_mini_test.rb now runs.José Valim2011-05-072-8/+1
| | |
* | | ordinalize negative numbers patchJason2011-05-072-2/+32
| | | | | | | | | | | | | | | | | | | | | Applied patch by Amir Manji https://github.com/rails/rails/issues/437#issuecomment-1116045 Signed-off-by: Jason <jasonmichaelroth@gmail.com>
* | | Merge pull request #286 from jasoncodes/marshal_subsecJosé Valim2011-05-072-0/+8
|\ \ \ | | | | | | | | Fix marshal round-tripping of fractional seconds (Time#subsec).
| * | | Fix marshal round-tripping of fractional seconds (Time#subsec).Jason Weathered2011-04-172-0/+8
| | | |
* | | | Merge pull request #275 from pk-amooma/masterJosé Valim2011-05-072-2/+14
|\ \ \ \ | | | | | | | | | | properly escape "'" to "'" for XML
| * | | | test "Escapes special HTML/XML characters" do ...Philipp Kempgen2011-04-261-0/+12
| | | | |
| * | | | for escaping HTML can be treated as normal XMLPhilipp Kempgen (Amooma)2011-04-141-2/+2
| | | | |
| * | | | properly escape "'" to "&apos;" for XML/HTML (BTW Erubis does that as well)Philipp Kempgen (Amooma)2011-04-141-2/+2
| | | | |
* | | | | Merge remote branch 'rolftimmermans/desc_tracker'José Valim2011-05-077-34/+64
|\ \ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'upstream/master' into desc_trackerRolf Timmermans2011-03-272-9/+11
| |\ \ \ \ \
| * | | | | | Revert "Revert "It should be possible to use ↵Rolf Timmermans2011-03-131-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActiveSupport::DescendantTracker without getting ActiveSupport::Dependencies for free."" This reverts commit 9f5b1e1ed08df9dbedded0a6b7798d919d43b9a6. Tests have been refactored so they pass in isolation.
| * | | | | | Refactored AS::DescendantsTracker test cases so they can be tested without ↵Rolf Timmermans2011-03-133-27/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | AS::Dependencies.
| * | | | | | Missing dependency in MultiByte test.Rolf Timmermans2011-03-131-0/+1
| | | | | | |
| * | | | | | Add missing dependency string inflection test.Rolf Timmermans2011-03-131-0/+1
| | | | | | |
| * | | | | | Missing dependency for duration test.Rolf Timmermans2011-03-131-0/+1
| | | | | | |
* | | | | | | Merge pull request #248 from bigfix/enumerable_as_jsonJosé Valim2011-05-072-10/+27
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Enumerable should pass encoding options to children in #as_json/#to_json
| * | | | | | | Enumerable should pass encoding options to children in #as_json/#to_json.John Firebaugh2011-04-012-10/+27
| | | | | | | |
* | | | | | | | Merge pull request #349 from bradley178/masterJosé Valim2011-05-072-3/+10
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | Hash.from_xml chokes on empty CDATA
| * | | | | | | Fix bug with empty CDATA not being handled in Hash.from_xmlBradley Harris2011-04-292-3/+4
| | | | | | | |
| * | | | | | | Added test for empty CDATA bug in from_xmlBradley Harris2011-04-291-2/+8
| | | | | | | |
* | | | | | | | Move variables to underscore format, update protected instance variables list.José Valim2011-05-062-6/+16
| | | | | | | |
* | | | | | | | minitest/ruby19 compatible performance testJan Xie2011-05-051-43/+88
| | | | | | | |
* | | | | | | | Prepare for beta1David Heinemeier Hansson2011-05-041-1/+1
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Use #remove_possible_method insteadSebastian Martinez2011-05-041-1/+1
| | | | | | |
* | | | | | | Relax this dependency a bit.José Valim2011-05-041-1/+1
| | | | | | |
* | | | | | | convert strings to lambdas so we can use a consistent interface to the ↵Aaron Patterson2011-05-011-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | objects in the collection
* | | | | | | assert_difference can take a callable piece of code rather than just evaling ↵Aaron Patterson2011-05-011-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | a string
* | | | | | | Merge branch 'master' of github.com:lifo/docrailsDan Pickett2011-04-292-6/+4
|\ \ \ \ \ \ \
| * | | | | | | minor changesVijay Dev2011-04-272-6/+4
| | | | | | | |
* | | | | | | | No need for &block here.José Valim2011-04-291-1/+1
| |/ / / / / / |/| | | | | |
* | | | | | | Tidy up previous commit.José Valim2011-04-281-3/+8
| | | | | | |
* | | | | | | Merged pull request #219 from panthomakos/memcache.José Valim2011-04-282-1/+42
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Character encoding issues with MemCacheStore in 1.9.2
| * | | | | | | Fixed special character encoding issue with MemCacheStore in Ruby 1.9.2.Pan Thomakos2011-03-112-1/+42
| | | | | | | |
* | | | | | | | Merged pull request #328 from MSNexploder/fix_clear_inflector.José Valim2011-04-282-13/+31
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | proper reset all inflector scopes
| * | | | | | | | proper reset all inflector scopesStefan Huber2011-04-252-13/+31
| | |/ / / / / / | |/| | | | | |
* | | | | | | | fixed a small bug with Array#from core_extJosh Kalderimis2011-04-271-1/+1
| | | | | | | |
* | | | | | | | using @tenderlove's suggested implementation to speed things upJared McFarland2011-04-271-1/+1
| | | | | | | |
* | | | | | | | fixing Array#from to return consistent resultsJared McFarland2011-04-262-3/+3
| | | | | | | |
* | | | | | | | simplifying buffered logger for easier and slightly more performant codes. ↵Aaron Patterson2011-04-262-10/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pumpkin
* | | | | | | | bump multi_json dependencyJosh Kalderimis2011-04-261-1/+1
| | | | | | | |
* | | | | | | | bump AS deprecation_horizon to 3.2Josh Kalderimis2011-04-251-1/+1
|/ / / / / / /
* | | | | | | Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-04-232-3/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 09:22:16 +0000