aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #286 from jasoncodes/marshal_subsecJosé Valim2011-05-071-0/+1
|\
| * Fix marshal round-tripping of fractional seconds (Time#subsec).Jason Weathered2011-04-171-0/+1
* | Merge pull request #275 from pk-amooma/masterJosé Valim2011-05-071-2/+2
|\ \
| * | for escaping HTML can be treated as normal XMLPhilipp Kempgen (Amooma)2011-04-141-2/+2
| * | properly escape "'" to "'" 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-071-7/+9
|\ \ \
| * \ \ Merge remote-tracking branch 'upstream/master' into desc_trackerRolf Timmermans2011-03-271-5/+7
| |\ \ \
| * | | | Revert "Revert "It should be possible to use ActiveSupport::DescendantTracker...Rolf Timmermans2011-03-131-7/+9
* | | | | Merge pull request #248 from bigfix/enumerable_as_jsonJosé Valim2011-05-071-1/+3
|\ \ \ \ \
| * | | | | Enumerable should pass encoding options to children in #as_json/#to_json.John Firebaugh2011-04-011-1/+3
* | | | | | Merge pull request #349 from bradley178/masterJosé Valim2011-05-071-1/+2
|\ \ \ \ \ \
| * | | | | | Fix bug with empty CDATA not being handled in Hash.from_xmlBradley Harris2011-04-291-1/+2
* | | | | | | Move variables to underscore format, update protected instance variables list.José Valim2011-05-061-6/+9
* | | | | | | 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
* | | | | | | convert strings to lambdas so we can use a consistent interface to the object...Aaron Patterson2011-05-011-5/+5
* | | | | | | assert_difference can take a callable piece of code rather than just evaling ...Aaron Patterson2011-05-011-4/+15
* | | | | | | 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-281-1/+4
|\ \ \ \ \ \ \
| * | | | | | | Fixed special character encoding issue with MemCacheStore in Ruby 1.9.2.Pan Thomakos2011-03-111-1/+4
* | | | | | | | Merged pull request #328 from MSNexploder/fix_clear_inflector.José Valim2011-04-281-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | proper reset all inflector scopesStefan Huber2011-04-251-1/+1
| | |/ / / / / / | |/| | | | | |
* | | | | | | | 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-261-2/+2
* | | | | | | | simplifying buffered logger for easier and slightly more performant codes. pu...Aaron Patterson2011-04-262-10/+5
* | | | | | | | 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
|\ \ \ \ \ \ \
| * | | | | | | Grammar fixes for Object#in? documentation.Cheah Chu Yeow2011-04-221-2/+2
| * | | | | | | NilClass is a singletonAkira Matsuda2011-04-201-1/+1
* | | | | | | | File watcher won't make the cut for 3.1. Maybe on 3.2.José Valim2011-04-231-1/+0
|/ / / / / / /
* | | | | | | Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-04-194-25/+112
|\ \ \ \ \ \ \
| * | | | | | | remove unwanted Example headers as per the guidelines, s/instaces of NilClass...Xavier Noria2011-04-191-21/+36
| * | | | | | | commit copy-edit: simplifies blank? rdoc and revises formattingXavier Noria2011-04-191-24/+23
| * | | | | | | Revert "Formated docs"Xavier Noria2011-04-191-9/+9
| * | | | | | | Formated docsSebastian Martinez2011-04-181-9/+9
| * | | | | | | oops fixed typoSebastian Martinez2011-04-181-1/+1
| * | | | | | | Fixed docs for NilClass#trySebastian Martinez2011-04-181-8/+8
| * | | | | | | Formatting docsSebastian Martinez2011-04-172-11/+11
| * | | | | | | Docs for +duplicable?+Sebastian Martinez2011-04-171-4/+28
| * | | | | | | Docs for NilClass#trySebastian Martinez2011-04-171-1/+13
| * | | | | | | Formatting examplesSebastian Martinez2011-04-171-6/+12
| * | | | | | | Documented String#blank?Sebastian Martinez2011-04-171-1/+7
| * | | | | | | Documented Hash#blank?Sebastian Martinez2011-04-171-1/+6
| * | | | | | | Documented Array#blank?Sebastian Martinez2011-04-171-1/+6
| * | | | | | | Documented TrueClass#blank?Sebastian Martinez2011-04-171-1/+5