| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 |
| | | | |||||
| * | | indifferent access should recurse Hash subclasses | David Lee | 2011-05-08 | 3 | -2/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/methodoverride | José Valim | 2011-05-08 | 1 | -0/+1 |
| |\ \ | | | | | | | Logs should show overridden method; Issue 426 | ||||
| | * | | Logs should show overridden method; Issue 426 | David Lee | 2011-05-07 | 1 | -0/+1 |
| | | | | |||||
| * | | | Fix failing xml mini test. | José Valim | 2011-05-08 | 1 | -1/+4 |
| | | | | |||||
| * | | | Revert "Merge pull request #275 from pk-amooma/master" | José Valim | 2011-05-07 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | Several AP tests fail after this change. This reverts commit aaf01cd53718c8aa5b69ac056b997e6dd9893777, reversing changes made to 9cc18c52faeebaad6a76bd62cdca1c6b9f96afed. | ||||
| * | | | xml_mini_test.rb now runs. | José Valim | 2011-05-07 | 1 | -0/+1 |
| | | | | |||||
| * | | | ordinalize negative numbers patch | Jason | 2011-05-07 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | 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_subsec | José Valim | 2011-05-07 | 1 | -0/+1 |
| |\ \ \ | | | | | | | | | Fix marshal round-tripping of fractional seconds (Time#subsec). | ||||
| | * | | | Fix marshal round-tripping of fractional seconds (Time#subsec). | Jason Weathered | 2011-04-17 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Merge pull request #275 from pk-amooma/master | José Valim | 2011-05-07 | 1 | -2/+2 |
| |\ \ \ \ | | | | | | | | | | | properly escape "'" to "'" for XML | ||||
| | * | | | | for escaping HTML can be treated as normal XML | Philipp Kempgen (Amooma) | 2011-04-14 | 1 | -2/+2 |
| | | | | | | |||||
| | * | | | | properly escape "'" to "'" for XML/HTML (BTW Erubis does that as well) | Philipp Kempgen (Amooma) | 2011-04-14 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | Merge remote branch 'rolftimmermans/desc_tracker' | José Valim | 2011-05-07 | 1 | -7/+9 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Merge remote-tracking branch 'upstream/master' into desc_tracker | Rolf Timmermans | 2011-03-27 | 1 | -5/+7 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | Revert "Revert "It should be possible to use ↵ | Rolf Timmermans | 2011-03-13 | 1 | -7/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActiveSupport::DescendantTracker without getting ActiveSupport::Dependencies for free."" This reverts commit 9f5b1e1ed08df9dbedded0a6b7798d919d43b9a6. Tests have been refactored so they pass in isolation. | ||||
| * | | | | | | | Merge pull request #248 from bigfix/enumerable_as_json | José Valim | 2011-05-07 | 1 | -1/+3 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | 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 Firebaugh | 2011-04-01 | 1 | -1/+3 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #349 from bradley178/master | José Valim | 2011-05-07 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | Hash.from_xml chokes on empty CDATA | ||||
| | * | | | | | | | Fix bug with empty CDATA not being handled in Hash.from_xml | Bradley Harris | 2011-04-29 | 1 | -1/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | Move variables to underscore format, update protected instance variables list. | José Valim | 2011-05-06 | 1 | -6/+9 |
| | | | | | | | | | |||||
| * | | | | | | | | minitest/ruby19 compatible performance test | Jan Xie | 2011-05-05 | 1 | -43/+88 |
| | | | | | | | | | |||||
| * | | | | | | | | Prepare for beta1 | David Heinemeier Hansson | 2011-05-04 | 1 | -1/+1 |
| | |_|_|_|_|_|/ |/| | | | | | | |||||
| * | | | | | | | Use #remove_possible_method instead | Sebastian Martinez | 2011-05-04 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | convert strings to lambdas so we can use a consistent interface to the ↵ | Aaron Patterson | 2011-05-01 | 1 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | objects in the collection | ||||
| * | | | | | | | assert_difference can take a callable piece of code rather than just evaling ↵ | Aaron Patterson | 2011-05-01 | 1 | -4/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a string | ||||
| * | | | | | | | Merge branch 'master' of github.com:lifo/docrails | Dan Pickett | 2011-04-29 | 2 | -6/+4 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | minor changes | Vijay Dev | 2011-04-27 | 2 | -6/+4 |
| | | | | | | | | | |||||
| * | | | | | | | | No need for &block here. | José Valim | 2011-04-29 | 1 | -1/+1 |
| | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | | Tidy up previous commit. | José Valim | 2011-04-28 | 1 | -3/+8 |
| | | | | | | | | |||||
| * | | | | | | | Merged pull request #219 from panthomakos/memcache. | José Valim | 2011-04-28 | 1 | -1/+4 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Character encoding issues with MemCacheStore in 1.9.2 | ||||
| | * | | | | | | | Fixed special character encoding issue with MemCacheStore in Ruby 1.9.2. | Pan Thomakos | 2011-03-11 | 1 | -1/+4 |
| | | | | | | | | | |||||
| * | | | | | | | | Merged pull request #328 from MSNexploder/fix_clear_inflector. | José Valim | 2011-04-28 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | proper reset all inflector scopes | ||||
| | * | | | | | | | | proper reset all inflector scopes | Stefan Huber | 2011-04-25 | 1 | -1/+1 |
| | | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | | fixed a small bug with Array#from core_ext | Josh Kalderimis | 2011-04-27 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | using @tenderlove's suggested implementation to speed things up | Jared McFarland | 2011-04-27 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | fixing Array#from to return consistent results | Jared McFarland | 2011-04-26 | 1 | -2/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | simplifying buffered logger for easier and slightly more performant codes. ↵ | Aaron Patterson | 2011-04-26 | 2 | -10/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pumpkin | ||||
| * | | | | | | | | bump AS deprecation_horizon to 3.2 | Josh Kalderimis | 2011-04-25 | 1 | -1/+1 |
| |/ / / / / / / | |||||
| * | | | | | | | Grammar fixes for Object#in? documentation. | Cheah Chu Yeow | 2011-04-22 | 1 | -2/+2 |
| | | | | | | | | |||||
| * | | | | | | | NilClass is a singleton | Akira Matsuda | 2011-04-20 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-04-19 | 4 | -25/+112 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: railties/guides/source/ajax_on_rails.textile railties/guides/source/generators.textile | ||||
| | * | | | | | | | remove unwanted Example headers as per the guidelines, s/instaces of ↵ | Xavier Noria | 2011-04-19 | 1 | -21/+36 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NilClass/nil/ and friends, completes some rdocs | ||||
| | * | | | | | | | commit copy-edit: simplifies blank? rdoc and revises formatting | Xavier Noria | 2011-04-19 | 1 | -24/+23 |
| | | | | | | | | | |||||
| | * | | | | | | | Revert "Formated docs" | Xavier Noria | 2011-04-19 | 1 | -9/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reason: "To be blank" and "to be empty" belongs to our everyday terminology, they go in regular font. This reverts commit 280a8709923d2bf707ec4d82ac1e5cb14941da3d. | ||||
| | * | | | | | | | Formated docs | Sebastian Martinez | 2011-04-18 | 1 | -9/+9 |
| | | | | | | | | | |||||
| | * | | | | | | | oops fixed typo | Sebastian Martinez | 2011-04-18 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | Fixed docs for NilClass#try | Sebastian Martinez | 2011-04-18 | 1 | -8/+8 |
| | | | | | | | | | |||||
| | * | | | | | | | Formatting docs | Sebastian Martinez | 2011-04-17 | 2 | -11/+11 |
| | | | | | | | | | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |