aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'mainstream/master'Pratik Naik2009-05-1513-46/+55
|\ | | | | | | | | 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-131-0/+3
| |
| * Merge branch 'master' into wip_abstract_controllerYehuda Katz + Carl Lerche2009-05-1110-36/+49
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-111-0/+10
| | | | | | | | | | | | | | | | | | [#2615 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| | * Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2009-05-112-2/+6
| | |\
| | | * Change spelling of Kyev timezone to Kyiv [#2613 state:resolved]Alexander Dymo2009-05-101-2/+2
| | | |
| | | * ActiveSupport::OrderedHash#to_a method returns an ordered set of arrays. ↵Ken Collins2009-05-101-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-071-7/+7
| | |
| | * Make module dependency DSL opt inJoshua Peek2009-05-074-27/+25
| | |
| | * Fixed Hash#from_xml with keys that are all caps.codebrulee2009-05-041-1/+1
| | | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com>
| * | Don't run the action if callbacks are halted.Yehuda Katz + Carl Lerche2009-05-111-1/+1
| | | | | | | | | 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-011-0/+1
| |/
* | 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-3023-227/+381
|\|
| * 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-261-0/+162
| | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Don't undefine object_idJeremy Kemper2009-04-261-1/+1
| |
| * Privatize rails_to_jsonJeremy Kemper2009-04-2615-156/+170
| |
| * Extract json string escapingJeremy Kemper2009-04-262-38/+33
| |
| * Only Object to_json alias is needed. Prefer nil options.Jeremy Kemper2009-04-2614-33/+12
| |
| * Track object ids so the objects needn't respond to ==Jeremy Kemper2009-04-261-2/+2
| |
* | Merge commit 'mainstream/master'Pratik Naik2009-04-2353-125/+277
|\|
| * * Add pluggable JSON backends with support for the JSON gem. [rick]rick2009-04-2320-103/+198
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Example: ActiveSupport::JSON.backend = "JSONGem" All internal Rails JSON encoding is now handled by ActiveSupport::JSON.encode(). Use of #to_json is not recommended, as it may clash with other libraries that overwrite it. However, you can recover Rails specific functionality if you really want to use #to_json. gem 'json' ActiveSupport::JSON.backend = "JSONGem" class ActiveRecord::Base alias to_json rails_to_json end
| * Fix dependencies revealed by testing in isolationJeremy Kemper2009-04-2232-21/+73
| |
| * new_callbacks core extensionsJeremy Kemper2009-04-221-0/+3
| |
| * Fix tests on 1.9Jeremy Kemper2009-04-222-1/+3
| |
* | Merge commit 'mainstream/master'Pratik Naik2009-04-23134-3546/+3165
|\|
| * Merge branch 'master' into cherryJeremy Kemper2009-04-221-1/+0
| |\ | | | | | | | | | | | | Conflicts: activesupport/lib/active_support.rb
| | * Opt in to JSONJeremy Kemper2009-04-221-1/+0
| | |
| * | Opt in to DependenciesJeremy Kemper2009-04-225-10/+14
| |/
| * No more free lunchJeremy Kemper2009-04-223-4/+4
| |
| * stdlib autoloads were hanging on 1.9.1Jeremy Kemper2009-04-222-7/+4
| |
| * Divert CoreExtensions mention in docsJeremy Kemper2009-04-221-1/+1
| |
| * Convert string extension modules to class reopensJeremy Kemper2009-04-226-291/+247
| |
| * ActiveSupport.core_ext bridge util no longer usedJeremy Kemper2009-04-221-10/+0
| |
| * Switch last module core extension to class reopenJeremy Kemper2009-04-222-21/+6
| |
| * Merge branch 'master' into cherryJeremy Kemper2009-04-2025-76/+816
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activesupport/CHANGELOG activesupport/lib/active_support/core_ext/class/delegating_attributes.rb activesupport/lib/active_support/core_ext/hash/conversions.rb activesupport/lib/active_support/core_ext/module/attribute_accessors.rb activesupport/lib/active_support/core_ext/string/multibyte.rb activesupport/lib/active_support/core_ext/time/calculations.rb activesupport/lib/active_support/deprecation.rb
| | * Clearer String#first and #last edge cases. Fix that 'foo'.first(0) == 'foo' ↵Jeremy Kemper2009-04-201-2/+14
| | | | | | | | | | | | instead of ''
| | * Treating strings as enumerable is deprecatedJeremy Kemper2009-04-201-6/+6
| | |
| | * Clearer String#first and #last edge cases. Fix that foo.first(0) == instead ↵Jeremy Kemper2009-04-171-3/+15
| | | | | | | | | | | | of foo.
| * | Move AS::Duration autoload to core/time/autoloadJeremy Kemper2009-04-202-1/+1
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-30 03:48:10 +0000