Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'mainstream/master' | Pratik Naik | 2009-01-29 | 6 | -2/+51 |
|\ | |||||
| * | Only dup local cache values if duplicable [#1653 state:resolved] | Joshua Peek | 2009-01-28 | 2 | -1/+13 |
| | | |||||
| * | add #available_locales to I18n and I18n::SimpleBackend, flatten translations ↵ | Sven Fuchs | 2009-01-25 | 3 | -1/+34 |
| | | | | | | | | | | | | load_path when loading translations [#1714 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| * | add an inspect method to OrderedHash to make it clear that it is not a ↵ | Greg Borenstein | 2009-01-26 | 1 | -0/+4 |
| | | | | | | | | | | | | | | species of Array Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1782 state:committed] | ||||
| * | Merge docrails | Pratik Naik | 2009-01-18 | 10 | -13/+13 |
| | | |||||
* | | Updated Object#try doc to match lifo's "no code change" revert ↵ | Christos Zisopoulos | 2009-01-26 | 1 | -1/+1 |
| | | | | | | | | c9b8a26ba1cd8277580fc2a554fe3a67a52f1756 | ||||
* | | An updated description of Object#try to better reflect changes documented at ↵ | Christos Zisopoulos | 2009-01-26 | 1 | -4/+9 |
| | | | | | | | | | | | | http://is.gd/hdmo and http://is.gd/hdmQ Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | | We have a very strict NO code changes policy. | Pratik Naik | 2009-01-26 | 1 | -11/+6 |
| | | | | | | | | | | | | Revert "An updated description of Object#try to better reflect changes documented at http://is.gd/hdmo and http://is.gd/hdmQ" This reverts commit 929088189de1d189c643246a491ba8fb5347b1d3. | ||||
* | | An updated description of Object#try to better reflect changes documented at ↵ | Christos Zisopoulos | 2009-01-26 | 1 | -6/+11 |
| | | | | | | | | http://is.gd/hdmo and http://is.gd/hdmQ | ||||
* | | Merge commit 'mainstream/master' | Pratik Naik | 2009-01-18 | 11 | -49/+285 |
|\| | |||||
| * | Bump up the year in MIT license files | Pratik Naik | 2009-01-18 | 1 | -1/+1 |
| | | |||||
| * | Refactor Object#try to use inheritance. [#1774 state:resolved] | Josh Susser | 2009-01-18 | 2 | -17/+30 |
| | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Decouple the local cache strategy from MemCacheStore for reuse with other ↵ | Lourens Naude | 2009-01-17 | 4 | -75/+133 |
| | | | | | | | | | | | | remote stores [#1653 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| * | Dup keys in OrderedHash to prevent them from being modified [#1676 ↵ | Brandon Keepers | 2009-01-16 | 2 | -10/+31 |
| | | | | | | | | | | | | state:resolved] Signed-off-by: Frederick Cheung <frederick.cheung@gmail.com> | ||||
| * | Properly quote json keys. | Michael Koziarski | 2009-01-16 | 2 | -4/+4 |
| | | | | | | | | | | According to the RFC and the json.org site all json keys must be strings, and those strings must be quoted with double quotes. [#1755 state:committed] | ||||
| * | Added in a local per request cache to MemCacheStore. It acts as a buffer to ↵ | Nahum Wild | 2009-01-15 | 2 | -20/+164 |
| | | | | | | | | | | | | stop unneccessary requests being sent through to memcache [#1653 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | | removed colons from a few Example headers | Xavier Noria | 2009-01-17 | 9 | -11/+11 |
| | | |||||
* | | Merge commit 'mainstream/master' | Pratik Naik | 2009-01-14 | 5 | -12/+28 |
|\| | |||||
| * | Change Object#try to raise NoMethodError on private methods and always ↵ | Pratik Naik | 2009-01-13 | 2 | -10/+11 |
| | | | | | | | | return nil when Object is nil [Pratik Naik, Lawrence Pit] | ||||
| * | TimeWithZone#xmlschema accepts optional fraction_digits argument [#1725 ↵ | Nicholas Dainty | 2009-01-11 | 3 | -2/+17 |
| | | | | | | | | state:resolved] | ||||
* | | Merge commit 'mainstream/master' | Pratik Naik | 2009-01-10 | 25 | -83/+969 |
|\| | | | | | | | | | Conflicts: activerecord/lib/active_record/base.rb | ||||
| * | Process time should be wall time when benchmarking | Pratik Naik | 2009-01-09 | 1 | -1/+1 |
| | | |||||
| * | Object#tap for Ruby < 1.8.7 | Jeremy Kemper | 2009-01-07 | 3 | -0/+26 |
| | | |||||
| * | Fix JSON decoder date-converter regexp [#1662 state:resolved] [Jonathan del ↵ | Pratik Naik | 2009-01-07 | 2 | -2/+3 |
| | | | | | | | | Strother] | ||||
| * | TimeWithZone#- gives correct result with wrapped DateTime, and with DateTime ↵ | gbuesing | 2009-01-04 | 3 | -1/+12 |
| | | | | | | | | argument | ||||
| * | Allow multiple conditions for callbacks [#1627 state:resolved] | Joshua Peek | 2008-12-28 | 2 | -8/+43 |
| | | |||||
| * | Fix 'i18n' require broken by 0.0.1 -> 0.1.1 commit [#1658 state:committed] | Yaroslav Markin | 2008-12-28 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
| * | Update i18n gem to version 0.1.1 (Rails' changes were backported) [#1635 ↵ | Yaroslav Markin | 2008-12-28 | 16 | -71/+884 |
| | | | | | | | | | | | | state:committed] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
* | | Fix grammar (it's -> its) | Chris Kampmeier | 2008-12-31 | 1 | -2/+2 |
|/ | |||||
* | Inline code comments for class_eval/module_eval [#1657 state:resolved] | Xavier Noria | 2008-12-28 | 15 | -182/+194 |
| | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | MaKe Hash#slice! return removed values, akin to Array [#971 state:resolved] | trans | 2008-12-26 | 2 | -4/+25 |
| | | | | Signed-off-by: Frederick Cheung <frederick.cheung@gmail.com> | ||||
* | Add :allow_nil option to delegate [#1127 state:resolved] | Sergio Gil | 2008-12-21 | 3 | -1/+56 |
| | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | normalize author names in changelogs [#1495 state:committed] | Xavier Noria | 2008-12-16 | 1 | -88/+88 |
| | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
* | Revert "Make constantize look into ancestors" | Jeremy Kemper | 2008-12-15 | 2 | -40/+42 |
| | | | | | | [#410 state:open] This reverts commit 262fef7ed57520b857605a0105fe7ba9265654f6. | ||||
* | Make constantize look into ancestors | Frederick Cheung | 2008-12-15 | 2 | -42/+40 |
| | | | | | | [#410 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Properly parenthasize calls to defined?(Rails) in 75fa82418 [#1563 ↵ | Frederick Cheung | 2008-12-15 | 2 | -2/+2 |
| | | | | | | state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | Make delete_if/reject faster and fix other mutators | Frederick Cheung | 2008-12-15 | 2 | -13/+61 |
| | | | | | | [#1559 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Fixed ActiveSupport::OrderedHash #delete_if, #reject!, and #reject, which ↵ | Eloy Duran | 2008-12-11 | 2 | -1/+46 |
| | | | | | | | | did not sync the @keys after the operation. This probably holds true for other mutating methods as well. Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
* | Prefer Rails.logger over RAILS_DEFAULT_LOGGER | Joshua Peek | 2008-12-10 | 2 | -4/+4 |
| | |||||
* | Squash memory leak when calling flush with an empty buffer | Frederick Cheung | 2008-12-10 | 2 | -1/+10 |
| | | | | | | [#1552 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Added a :camelize option to ActiveRecord and Hash to_xml serialization and ↵ | Bruce Krysiak | 2008-12-10 | 2 | -7/+20 |
| | | | | | | from_xml deserialization Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
* | Rework ActiveSupport::OrderedHash to make lookups faster | Frederick Cheung | 2008-12-10 | 2 | -36/+33 |
| | | | | | | [#1352 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Merge branch 'master' of git@github.com:rails/rails | Jeremy Kemper | 2008-12-09 | 3 | -223/+244 |
|\ | | | | | | | | | Conflicts: activesupport/CHANGELOG | ||||
| * | Updated included memcache-client to the 1.5.0.5 version which includes fixes ↵ | David Heinemeier Hansson | 2008-12-09 | 3 | -223/+244 |
| | | | | | | | | | | | | from fiveruns and 37signals to deal with failover and timeouts (Joshua Sierles) [#1535 state:committed] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
* | | Benchmark.ms | Jeremy Kemper | 2008-12-09 | 3 | -8/+17 |
|/ | |||||
* | Add ActiveSupport::Multibyte::Chars#ord method so that it returns correct ↵ | Jason Cheow | 2008-12-08 | 3 | -0/+14 |
| | | | | | | | | Unicode value instead of falling back on String#ord in CoreExtensions, which is not multibyte compatible [#1483 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Changelog entry for #1397 | Jeremy Kemper | 2008-12-08 | 1 | -0/+2 |
| | |||||
* | Change Array#to_sentence I18n options to pass comma and space character from ↵ | Akira Matsuda | 2008-12-08 | 4 | -26/+38 |
| | | | | | | | | outside. [#1397 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Merge with docrails | Pratik Naik | 2008-12-07 | 3 | -1/+5 |
| | |||||
* | Silence server backtrace in rescue templates and log files. Also remove some ↵ | Joshua Peek | 2008-12-05 | 1 | -8/+11 |
| | | | | noise from missing template errors. |