aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
Commit message (Collapse)AuthorAgeFilesLines
* The original example was correct.Xavier Noria2009-05-251-1/+1
| | | | This reverts commit 4e56cc2f9917073c8774c28703cb6e3b7cbba848.
* typo in ASAdam Meehan2009-05-251-1/+1
|
* Document the way BufferedLogger defines its methods.Hongli Lai (Phusion)2009-05-241-0/+4
|
* Merge commit 'mainstream/master'Pratik Naik2009-05-2442-190/+413
|\ | | | | | | | | Conflicts: actionpack/lib/action_controller/base/mime_responds.rb
| * Avoid uninitialized instance variable warningJeremy Kemper2009-05-201-2/+2
| |
| * Single-require forward compatibility with new Ruby features like Object#tap, ↵Jeremy Kemper2009-05-201-0/+24
| | | | | | | | Enumerable#group_by, and Process.daemon. Code with the latest but run anywhere.
| * Extract autoloadsJeremy Kemper2009-05-202-24/+26
| |
| * Remove 'core' fluff. Hookable ActiveSupport.load_all!Jeremy Kemper2009-05-2014-26/+33
| |
| * Break out Symbol#to_proc as a future-ruby extensionJeremy Kemper2009-05-202-14/+15
| |
| * Break up misc Object extensionsJeremy Kemper2009-05-204-80/+85
| |
| * Remove bad addJeremy Kemper2009-05-201-0/+0
| |
| * Allow Module#depends_on to accept multiple modulesPratik Naik2009-05-212-4/+17
| |
| * Got controller/mime_responds_test.rb running on the new baseYehuda Katz + Carl Lerche2009-05-202-0/+10
| |
| * Corrected new callbacks semantics with regards to using objects for around ↵Yehuda Katz + Carl Lerche2009-05-192-3/+69
| | | | | | | | filters.
| * Use duck typing to also allow MemCache-like object when initializing a ↵Bryan Helmkamp2009-05-193-2/+8
| | | | | | | | | | | | MemCacheStore Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Allow MemCacheStore to be initialized with a MemCache object instead of ↵Bryan Helmkamp2009-05-193-10/+23
| | | | | | | | addresses and options
| * Include acts_as_string?Jeremy Kemper2009-05-181-0/+1
| |
| * Add ability to get multiple memcached keys at the same time (via ↵Joe Van Dyk2009-05-183-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 ↵rick2009-05-174-5/+17
| | | | | | | | JSONGem backend by default.
| * Add support for parsing XML and JSON from an IO as well as a string [#2659 ↵Brian Lopez2009-05-178-25/+74
| | | | | | | | | | | | state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
* | Merge commit 'mainstream/master'Pratik Naik2009-05-1519-49/+199
|\| | | | | | | | | Conflicts: actionpack/lib/action_view/helpers/form_helper.rb
| * Cherry-picking Active Support extensionsJeremy Kemper2009-05-141-0/+1
| |
| * Cherry-pick core extensionsJeremy Kemper2009-05-132-1/+4
| |
| * Merge branch 'master' into wip_abstract_controllerYehuda Katz + Carl Lerche2009-05-1114-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 Shearer2009-05-112-0/+16
| | | | | | | | | | | | | | | | | | [#2615 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| | * Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2009-05-114-2/+12
| | |\
| | | * Change spelling of Kyev timezone to Kyiv [#2613 state:resolved]Alexander Dymo2009-05-102-2/+4
| | | |
| | | * ActiveSupport::OrderedHash#to_a method returns an ordered set of arrays. ↵Ken Collins2009-05-102-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.9Jeremy Kemper2009-05-073-6/+6
| | |/
| | * Prefer "included" language over "setup"Joshua Peek2009-05-072-15/+15
| | |
| | * Make module dependency DSL opt inJoshua Peek2009-05-075-39/+40
| | |
| | * Add test coverage to module setup extensionsJoshua Peek2009-05-071-0/+74
| | |
| | * Fixed Hash#from_xml with keys that are all caps.codebrulee2009-05-042-1/+17
| | | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com>
| * | Don't run the action if callbacks are halted.Yehuda Katz + Carl Lerche2009-05-112-4/+12
| | | | | | | | | In AbstractController, this means that response_body is not empty
| * | Removed a stray method_missing in the new callbacks systemYehuda Katz + Carl Lerche2009-05-011-9/+0
| | |
| * | Makes new callbacks support keys with special charactersYehuda Katz + Carl Lerche2009-05-012-0/+29
| |/
* | Remove space between JSON keys and values since we're no longer emitting those.Cheah Chu Yeow2009-05-131-3/+3
| |
* | Some spelling changes.Evan Farrar2009-05-076-8/+8
| |
* | Minor update to RDoc for enumerable#sumMike Gunderloy2009-05-041-1/+1
| |
* | Merge commit 'mainstream/master'Pratik Naik2009-04-3028-243/+550
|\|
| * Work around Float faux precisionJeremy Kemper2009-04-303-15/+15
| |
| * Prefer behavior check to RUBY_VERSION to catch 1.8 backportsJeremy Kemper2009-04-293-5/+5
| |
| * Refactor ActionView::TemplateYehuda Katz + Carl Lerche2009-04-271-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 friendlinessJeremy Kemper2009-04-261-1/+1
| |
| * Now that we have a separate internal rails_to_json, use a separate circular ↵Jeremy Kemper2009-04-2616-26/+27
| | | | | | | | reference stack instead of sticking it in the options hash
| * Convert encoding before escapingJeremy Kemper2009-04-261-5/+6
| |
| * add JRuby-JDOM backend for XmlMiniStephen Bannasch2009-04-262-0/+315
| | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Don't undefine object_idJeremy Kemper2009-04-261-1/+1
| |
| * Privatize rails_to_jsonJeremy Kemper2009-04-2616-157/+171
| |
| * Extract json string escapingJeremy Kemper2009-04-262-38/+33
| |