Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Layouts work in AbstractController. Add support for the rspec runner for T::U | Yehuda Katz and Carl Lerche | 2009-04-07 | 2 | -33/+61 |
| | |||||
* | Add depends_on, use, and setup to abstract up ideas about module inheritance. | Yehuda Katz and Carl Lerche | 2009-04-07 | 2 | -0/+27 |
| | |||||
* | Changes necessary to run the T::U tests with the rspec runner | Yehuda Katz and Carl Lerche | 2009-04-06 | 1 | -2/+10 |
| | |||||
* | Rework NewCallbacks to not require method_missing | Yehuda Katz | 2009-03-17 | 1 | -1/+9 |
| | |||||
* | Use extlib accessor for new callbacks | Yehuda Katz | 2009-03-12 | 1 | -2/+2 |
| | |||||
* | Helpers with an initial test | Yehuda Katz | 2009-03-03 | 1 | -3/+3 |
| | |||||
* | Fixes multiple conditions | Yehuda Katz | 2009-02-27 | 1 | -2/+2 |
| | |||||
* | Add support for callbacks | Yehuda Katz | 2009-02-27 | 4 | -0/+975 |
| | |||||
* | First, very early, AbstractController code. More to come | Yehuda Katz | 2009-02-24 | 1 | -0/+79 |
| | |||||
* | Make tests pass | Yehuda Katz | 2009-02-02 | 1 | -121/+0 |
| | |||||
* | Whoops. | Yehuda Katz | 2009-02-02 | 1 | -0/+40 |
| | |||||
* | Add support for pending | Yehuda Katz | 2009-02-02 | 1 | -0/+2 |
| | |||||
* | Merge commit 'rails/3-0-unstable' | Yehuda Katz | 2009-02-02 | 1 | -25/+0 |
|\ | |||||
| * | Remove duplicate ConcurrentHash | Jeremy Kemper | 2009-01-31 | 1 | -25/+0 |
| | | |||||
* | | Some merge cleanup | Yehuda Katz | 2009-02-02 | 1 | -0/+121 |
| | | |||||
* | | 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> |