aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | 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-232-234/+0
|/ /
* | Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-04-194-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 Noria2011-04-191-21/+36
| | | | | | | | | | | | NilClass/nil/ and friends, completes some rdocs
| * | commit copy-edit: simplifies blank? rdoc and revises formattingXavier Noria2011-04-191-24/+23
| | |
| * | Revert "Formated docs"Xavier Noria2011-04-191-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 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
| | |
| * | Documented FalseClass#blank?Sebastian Martinez2011-04-171-1/+5
| | |
| * | Documented NilClass#blank?Sebastian Martinez2011-04-171-1/+5
| | |
| * | Added an example of exception situation on Array#sample docsSebastian Martinez2011-04-151-4/+5
| | |
| * | Improved Array#sample documentationSebastian Martinez2011-04-151-1/+3
| | |
* | | remove MultiJson from the Gemfile and instead add the current rc to the AS ↵Josh Kalderimis2011-04-191-0/+2
| | | | | | | | | | | | gemspec
* | | Merge branch 'master' of https://github.com/rails/rails into multi_jsonJosh Kalderimis2011-04-191-1/+1
|\ \ \
| * | | File should be open in read/write mode. When doing lock on a file.Arun Agrawal2011-04-181-1/+1
| | | |
* | | | AS Json parse_error makes a return for backwards compatibility, although it ↵Josh Kalderimis2011-04-192-1/+5
| | | | | | | | | | | | | | | | will return MultiJson::DecodeError
* | | | removed AS backends and instead rely on MultiJson for json decodingJosh Kalderimis2011-04-185-234/+37
|/ / /
* | | Add String#inquiry as a convenience method for turning a string into a ↵David Heinemeier Hansson2011-04-184-0/+21
| | | | | | | | | | | | StringInquirer object [DHH]
* | | Only rescue a thrown NoMethodError, don't preemptively check for #include?; ↵Jared McFarland2011-04-152-1/+8
| | | | | | | | | | | | added tests
* | | added an exception to Object#in? to match the methods documentationJared McFarland2011-04-151-0/+1
| | |
* | | files are a special case and need whitespace to be significantAndre Arko2011-04-141-1/+1
| | |
* | | gsub is not needed (thanks @fxn!)Andre Arko2011-04-141-1/+1
| | |
* | | attributes no longer disappear if a tag contains whitespaceAndre Arko2011-04-142-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | old: Hash.from_xml("<tag foo='bar'>\n</tag>") => {"tag"=>"\n"} new: Hash.from_xml("<tag foo='bar'>\n</tag>") => {"tag"=>{"foo"=>"bar", "__content__"=>"\n"}
* | | Add tests for InheritableOptions.Ben Orenstein2011-04-131-0/+26
| | | | | | | | | | | | | | | | | | [#6625 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* | | Remove `#among?` from Active SupportPrem Sichanugrist2011-04-137-21/+6
| | | | | | | | | | | | | | | | | | After a long list of discussion about the performance problem from using varargs and the reason that we can't find a great pair for it, it would be best to remove support for it for now. It will come back if we can find a good pair for it. For now, Bon Voyage, `#among?`.