Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | The original example was correct. | Xavier Noria | 2009-05-25 | 1 | -1/+1 |
| | | | | This reverts commit 4e56cc2f9917073c8774c28703cb6e3b7cbba848. | ||||
* | typo in AS | Adam Meehan | 2009-05-25 | 1 | -1/+1 |
| | |||||
* | Document the way BufferedLogger defines its methods. | Hongli Lai (Phusion) | 2009-05-24 | 1 | -0/+4 |
| | |||||
* | Merge commit 'mainstream/master' | Pratik Naik | 2009-05-24 | 42 | -190/+413 |
|\ | | | | | | | | | Conflicts: actionpack/lib/action_controller/base/mime_responds.rb | ||||
| * | Avoid uninitialized instance variable warning | Jeremy Kemper | 2009-05-20 | 1 | -2/+2 |
| | | |||||
| * | Single-require forward compatibility with new Ruby features like Object#tap, ↵ | Jeremy Kemper | 2009-05-20 | 1 | -0/+24 |
| | | | | | | | | Enumerable#group_by, and Process.daemon. Code with the latest but run anywhere. | ||||
| * | Extract autoloads | Jeremy Kemper | 2009-05-20 | 2 | -24/+26 |
| | | |||||
| * | Remove 'core' fluff. Hookable ActiveSupport.load_all! | Jeremy Kemper | 2009-05-20 | 14 | -26/+33 |
| | | |||||
| * | Break out Symbol#to_proc as a future-ruby extension | Jeremy Kemper | 2009-05-20 | 2 | -14/+15 |
| | | |||||
| * | Break up misc Object extensions | Jeremy Kemper | 2009-05-20 | 4 | -80/+85 |
| | | |||||
| * | Remove bad add | Jeremy Kemper | 2009-05-20 | 1 | -0/+0 |
| | | |||||
| * | Allow Module#depends_on to accept multiple modules | Pratik Naik | 2009-05-21 | 2 | -4/+17 |
| | | |||||
| * | Got controller/mime_responds_test.rb running on the new base | Yehuda Katz + Carl Lerche | 2009-05-20 | 2 | -0/+10 |
| | | |||||
| * | Corrected new callbacks semantics with regards to using objects for around ↵ | Yehuda Katz + Carl Lerche | 2009-05-19 | 2 | -3/+69 |
| | | | | | | | | filters. | ||||
| * | Use duck typing to also allow MemCache-like object when initializing a ↵ | Bryan Helmkamp | 2009-05-19 | 3 | -2/+8 |
| | | | | | | | | | | | | MemCacheStore Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Allow MemCacheStore to be initialized with a MemCache object instead of ↵ | Bryan Helmkamp | 2009-05-19 | 3 | -10/+23 |
| | | | | | | | | addresses and options | ||||
| * | Include acts_as_string? | Jeremy Kemper | 2009-05-18 | 1 | -0/+1 |
| | | |||||
| * | Add ability to get multiple memcached keys at the same time (via ↵ | Joe Van Dyk | 2009-05-18 | 3 | -0/+14 |
| | | | | | | | | | | | | MemCacheStore#read_multi). Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | load the JSON Backend lazily. If the JSON gem is already loaded, use the ↵ | rick | 2009-05-17 | 4 | -5/+17 |
| | | | | | | | | JSONGem backend by default. | ||||
| * | Add support for parsing XML and JSON from an IO as well as a string [#2659 ↵ | Brian Lopez | 2009-05-17 | 8 | -25/+74 |
| | | | | | | | | | | | | state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | | Merge commit 'mainstream/master' | Pratik Naik | 2009-05-15 | 19 | -49/+199 |
|\| | | | | | | | | | Conflicts: actionpack/lib/action_view/helpers/form_helper.rb | ||||
| * | Cherry-picking Active Support extensions | Jeremy Kemper | 2009-05-14 | 1 | -0/+1 |
| | | |||||
| * | Cherry-pick core extensions | Jeremy Kemper | 2009-05-13 | 2 | -1/+4 |
| | | |||||
| * | Merge branch 'master' into wip_abstract_controller | Yehuda Katz + Carl Lerche | 2009-05-11 | 14 | -36/+154 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: actionpack/lib/action_controller/abstract/callbacks.rb actionpack/lib/action_controller/abstract/renderer.rb actionpack/lib/action_controller/base/base.rb actionpack/lib/action_controller/dispatch/dispatcher.rb actionpack/lib/action_controller/routing/route_set.rb actionpack/lib/action_controller/testing/process.rb actionpack/test/abstract_controller/layouts_test.rb actionpack/test/controller/filters_test.rb actionpack/test/controller/helper_test.rb actionpack/test/controller/render_test.rb actionpack/test/new_base/test_helper.rb | ||||
| | * | ActiveSupport::OrderedHash[1,2,3,4] creates an OrderedHash instead of a Hash. | Douglas F Shearer | 2009-05-11 | 2 | -0/+16 |
| | | | | | | | | | | | | | | | | | | [#2615 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| | * | Merge branch 'master' of git@github.com:rails/rails | Jeremy Kemper | 2009-05-11 | 4 | -2/+12 |
| | |\ | |||||
| | | * | Change spelling of Kyev timezone to Kyiv [#2613 state:resolved] | Alexander Dymo | 2009-05-10 | 2 | -2/+4 |
| | | | | |||||
| | | * | ActiveSupport::OrderedHash#to_a method returns an ordered set of arrays. ↵ | Ken Collins | 2009-05-10 | 2 | -0/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Matches ruby1.9's Hash#to_a. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#2629 state:committed] | ||||
| | * | | Check for date/time methods that moved upstream in 1.9 | Jeremy Kemper | 2009-05-07 | 3 | -6/+6 |
| | |/ | |||||
| | * | Prefer "included" language over "setup" | Joshua Peek | 2009-05-07 | 2 | -15/+15 |
| | | | |||||
| | * | Make module dependency DSL opt in | Joshua Peek | 2009-05-07 | 5 | -39/+40 |
| | | | |||||
| | * | Add test coverage to module setup extensions | Joshua Peek | 2009-05-07 | 1 | -0/+74 |
| | | | |||||
| | * | Fixed Hash#from_xml with keys that are all caps. | codebrulee | 2009-05-04 | 2 | -1/+17 |
| | | | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
| * | | Don't run the action if callbacks are halted. | Yehuda Katz + Carl Lerche | 2009-05-11 | 2 | -4/+12 |
| | | | | | | | | | In AbstractController, this means that response_body is not empty | ||||
| * | | Removed a stray method_missing in the new callbacks system | Yehuda Katz + Carl Lerche | 2009-05-01 | 1 | -9/+0 |
| | | | |||||
| * | | Makes new callbacks support keys with special characters | Yehuda Katz + Carl Lerche | 2009-05-01 | 2 | -0/+29 |
| |/ | |||||
* | | Remove space between JSON keys and values since we're no longer emitting those. | Cheah Chu Yeow | 2009-05-13 | 1 | -3/+3 |
| | | |||||
* | | Some spelling changes. | Evan Farrar | 2009-05-07 | 6 | -8/+8 |
| | | |||||
* | | Minor update to RDoc for enumerable#sum | Mike Gunderloy | 2009-05-04 | 1 | -1/+1 |
| | | |||||
* | | Merge commit 'mainstream/master' | Pratik Naik | 2009-04-30 | 28 | -243/+550 |
|\| | |||||
| * | Work around Float faux precision | Jeremy Kemper | 2009-04-30 | 3 | -15/+15 |
| | | |||||
| * | Prefer behavior check to RUBY_VERSION to catch 1.8 backports | Jeremy Kemper | 2009-04-29 | 3 | -5/+5 |
| | | |||||
| * | Refactor ActionView::Template | Yehuda Katz + Carl Lerche | 2009-04-27 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | ActionView::Template is now completely independent from template storage, which allows different back ends such as the database. ActionView::Template's only responsibility is to take in the template source (passed in from ActionView::Path), compile it, and render it. | ||||
| * | Use __send__ for BasicObject friendliness | Jeremy Kemper | 2009-04-26 | 1 | -1/+1 |
| | | |||||
| * | Now that we have a separate internal rails_to_json, use a separate circular ↵ | Jeremy Kemper | 2009-04-26 | 16 | -26/+27 |
| | | | | | | | | reference stack instead of sticking it in the options hash | ||||
| * | Convert encoding before escaping | Jeremy Kemper | 2009-04-26 | 1 | -5/+6 |
| | | |||||
| * | add JRuby-JDOM backend for XmlMini | Stephen Bannasch | 2009-04-26 | 2 | -0/+315 |
| | | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Don't undefine object_id | Jeremy Kemper | 2009-04-26 | 1 | -1/+1 |
| | | |||||
| * | Privatize rails_to_json | Jeremy Kemper | 2009-04-26 | 16 | -157/+171 |
| | | |||||
| * | Extract json string escaping | Jeremy Kemper | 2009-04-26 | 2 | -38/+33 |
| | |