Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'rails/3-0-unstable' | Yehuda Katz | 2009-01-30 | 3 | -0/+65 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: actionpack/lib/action_controller/base.rb actionpack/lib/action_dispatch/http/mime_type.rb actionpack/lib/action_dispatch/http/request.rb actionpack/lib/action_view/base.rb actionpack/lib/action_view/paths.rb actionpack/test/controller/session/cookie_store_test.rb actionpack/test/dispatch/rack_test.rb actionpack/test/dispatch/request_test.rb | ||||
| * | Reorganize ActionController folder structure | Joshua Peek | 2009-01-27 | 1 | -0/+38 |
| | | |||||
| * | Begin unifying the interface between ActionController and ActionView | Yehuda Katz | 2009-01-22 | 15 | -44/+84 |
| | | |||||
* | | Sync 'rails/rails/master' | Yehuda Katz | 2009-01-30 | 25 | -68/+362 |
|\ \ | |||||
| * | | Ensure constant_watch_stack is protected by a mutex, so concurrent requires ↵ | Charles Nutter | 2009-01-30 | 1 | -5/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | do not corrupt it. [#1816 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | | 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 |
| | | |||||
| * | 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> | ||||
* | | Sync 'rails/rails/master' | Yehuda Katz | 2009-01-13 | 2 | -10/+11 |
|\| | |||||
| * | 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] | ||||
* | | Sync 'rails/rails/master' | Yehuda Katz | 2009-01-11 | 3 | -2/+17 |
|\| | |||||
| * | TimeWithZone#xmlschema accepts optional fraction_digits argument [#1725 ↵ | Nicholas Dainty | 2009-01-11 | 3 | -2/+17 |
| | | | | | | | | state:resolved] | ||||
* | | Sync 'rails/rails/master' | Yehuda Katz | 2009-01-09 | 1 | -1/+1 |
|\| | |||||
| * | 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 | ||||
* | | Object#tap for Ruby < 1.8.7 | Jeremy Kemper | 2009-01-09 | 3 | -0/+26 |
| | | |||||
* | | Fix JSON decoder date-converter regexp [#1662 state:resolved] [Jonathan del ↵ | Pratik Naik | 2009-01-09 | 2 | -2/+3 |
| | | | | | | | | Strother] | ||||
* | | Sync 'rails/rails/master' | Yehuda Katz | 2009-01-05 | 3 | -1/+12 |
| | | |||||
* | | It was decided that Multibyte does not belong to as/mini. | Michael S. Klishin | 2008-12-29 | 1 | -8/+2 |
| | | |||||
* | | Pull up some other changes from rails/rails/master | Michael S. Klishin | 2008-12-29 | 2 | -8/+43 |
|\| | |||||
| * | Allow multiple conditions for callbacks [#1627 state:resolved] | Joshua Peek | 2008-12-28 | 2 | -8/+43 |
| | | |||||
* | | Sync i18n update from rails/rails/master | Michael S. Klishin | 2008-12-28 | 16 | -71/+884 |
|\| | |||||
| * | 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> | ||||
* | | Sync with rails/rails/master, merge two metaprogramming annotation efforts | Michael S. Klishin | 2008-12-28 | 12 | -160/+170 |
|\| | |||||
| * | 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> | ||||
* | | Use active_support/mini instead of active_support/minimalistic | Michael S. Klishin | 2008-12-28 | 1 | -15/+0 |
| | | |||||
* | | Sync with wycats/rails/master | Michael S. Klishin | 2008-12-28 | 12 | -161/+178 |
|\ \ | |||||
| * | | Annotated metaprogramming code across ActiveSupport | Michael S. Klishin | 2008-12-28 | 13 | -162/+183 |
| |/ | |||||
* | | active_support/minimalistic.rb => active_support/mini.rb | Michael S. Klishin | 2008-12-28 | 1 | -0/+0 |
| | | |||||
* | | Introduce minimalistic package for ActiveSupport. | Michael S. Klishin | 2008-12-28 | 2 | -1/+20 |
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To simplify using of ActiveSupport in 3rd party libraries, a simple way to require only minimum of commonly used extensions (multibyte, inflections, array and hash extensions, #blank?, and a few others) is needed. For exactly this reason some out-of-Rails-space libraries adopted Extlib, originally from DataMapper. To keep it 2067% backwards compatible, and still available to everyone even in 2.x releases, active_support/minimalistic.rb was added. Use it like this: gem 'active_support', '>=2.3' require 'active_support/minimalistic' instead of require 'activesupport' Right now this package with RubyGems uses about 10 megs of RAM (10.01 or so). It can be further slimmed down though, once we simplify multibyte implementation that right now uses advanced accessors from Module extensions. To compare RAM usage with previous ActiveSupport versions and Extlib, at the time of writing, see http://gist.github.com/40401. | ||||
* | 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> |