aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'mainstream/master'Pratik Naik2008-12-164-6/+99
|\
| * Revert "Make constantize look into ancestors"Jeremy Kemper2008-12-152-40/+42
| | | | | | | | | | | | [#410 state:open] This reverts commit 262fef7ed57520b857605a0105fe7ba9265654f6.
| * Make constantize look into ancestorsFrederick Cheung2008-12-152-42/+40
| | | | | | | | | | | | [#410 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Properly parenthasize calls to defined?(Rails) in 75fa82418 [#1563 ↵Frederick Cheung2008-12-152-2/+2
| | | | | | | | | | | | state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Make delete_if/reject faster and fix other mutatorsFrederick Cheung2008-12-152-13/+61
| | | | | | | | | | | | [#1559 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Fixed ActiveSupport::OrderedHash #delete_if, #reject!, and #reject, which ↵Eloy Duran2008-12-112-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>
* | Merge commit 'mainstream/master'Pratik Naik2008-12-1119-305/+382
|\| | | | | | | | | | | | | Conflicts: railties/doc/guides/html/activerecord_validations_callbacks.html railties/doc/guides/source/activerecord_validations_callbacks.txt
| * Prefer Rails.logger over RAILS_DEFAULT_LOGGERJoshua Peek2008-12-102-4/+4
| |
| * Squash memory leak when calling flush with an empty bufferFrederick Cheung2008-12-102-1/+10
| | | | | | | | | | | | [#1552 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Added a :camelize option to ActiveRecord and Hash to_xml serialization and ↵Bruce Krysiak2008-12-102-7/+20
| | | | | | | | | | | | from_xml deserialization Signed-off-by: Michael Koziarski <michael@koziarski.com>
| * Rework ActiveSupport::OrderedHash to make lookups fasterFrederick Cheung2008-12-102-36/+33
| | | | | | | | | | | | [#1352 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2008-12-093-223/+244
| |\ | | | | | | | | | | | | Conflicts: activesupport/CHANGELOG
| | * Updated included memcache-client to the 1.5.0.5 version which includes fixes ↵David Heinemeier Hansson2008-12-093-223/+244
| | | | | | | | | | | | | | | | | | from fiveruns and 37signals to deal with failover and timeouts (Joshua Sierles) [#1535 state:committed] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
| * | Benchmark.msJeremy Kemper2008-12-093-8/+17
| |/
| * Add ActiveSupport::Multibyte::Chars#ord method so that it returns correct ↵Jason Cheow2008-12-083-0/+14
| | | | | | | | | | | | | | | | Unicode value instead of falling back on String#ord in CoreExtensions, which is not multibyte compatible [#1483 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Changelog entry for #1397Jeremy Kemper2008-12-081-0/+2
| |
| * Change Array#to_sentence I18n options to pass comma and space character from ↵Akira Matsuda2008-12-084-26/+38
| | | | | | | | | | | | | | | | outside. [#1397 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Merge with docrailsPratik Naik2008-12-073-1/+5
| |
* | Fix example using wrong method nameFrederick Cheung2008-12-101-3/+3
| |
* | Merge commit 'mainstream/master'Pratik Naik2008-12-07210-2215/+1685
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: actionmailer/lib/action_mailer/base.rb actionpack/lib/action_controller/base.rb actionpack/lib/action_controller/mime_type.rb railties/doc/guides/html/activerecord_validations_callbacks.html railties/doc/guides/html/caching_with_rails.html railties/doc/guides/html/command_line.html railties/doc/guides/html/configuring.html railties/doc/guides/html/creating_plugins.html railties/doc/guides/html/finders.html railties/doc/guides/html/routing_outside_in.html railties/doc/guides/source/activerecord_validations_callbacks.txt railties/doc/guides/source/caching_with_rails.txt railties/doc/guides/source/command_line.txt railties/doc/guides/source/creating_plugins/acts_as_yaffle.txt railties/doc/guides/source/creating_plugins/controllers.txt railties/doc/guides/source/creating_plugins/core_ext.txt railties/doc/guides/source/creating_plugins/helpers.txt railties/doc/guides/source/creating_plugins/index.txt railties/doc/guides/source/creating_plugins/migration_generator.txt railties/doc/guides/source/creating_plugins/models.txt railties/doc/guides/source/creating_plugins/odds_and_ends.txt railties/doc/guides/source/creating_plugins/routes.txt railties/doc/guides/source/finders.txt railties/doc/guides/source/routing_outside_in.txt railties/doc/guides/source/testing_rails_applications.txt
| * Silence server backtrace in rescue templates and log files. Also remove some ↵Joshua Peek2008-12-051-8/+11
| | | | | | | | noise from missing template errors.
| * Add Memoizable#flush_cache to clear the cache of a specific method [#1505 ↵Joshua Peek2008-12-032-16/+38
| | | | | | | | state:resolved]
| * Ruby 1.9 compat: no Unicode normalization support yetJeremy Kemper2008-11-263-3/+27
| |
| * Ruby 1.9 compat: CGI#escape_skipping_slashesJeremy Kemper2008-11-261-5/+14
| |
| * MiniTest::Unit#method_name alias for Test::Unit compatJeremy Kemper2008-11-261-0/+1
| |
| * Don't re-require 'rexml/document'Pratik Naik2008-11-261-1/+1
| |
| * Added ActiveSupport::OrderedHash#each_key and ↵Christoffer Sawicki2008-11-263-0/+22
| | | | | | | | | | | | ActiveSupport::OrderedHash#each_value [#1410 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Simpler and clearer to just explicitly require the JSON encodersJeremy Kemper2008-11-261-9/+15
| |
| * Autoload ActiveSupport::XmlMiniJeremy Kemper2008-11-262-1/+1
| |
| * Require as little of REXML as possible to apply the entity_expansion_limit fixJeremy Kemper2008-11-261-24/+29
| |
| * Lazy-require CGI for Object#to_queryJeremy Kemper2008-11-261-2/+1
| |
| * Extract XmlMini. Namespace FileLike extension.Jeremy Kemper2008-11-252-128/+125
| |
| * Rescue OpenSSL::Cipher::CipherError or OpenSSL::CipherError depending on ↵Jeremy Kemper2008-11-251-3/+4
| | | | | | | | which is present
| * Unbundled XmlSimpleJeremy Kemper2008-11-252-1027/+0
| |
| * Extract XmlMini from XmlSimple. [#1474 state:committed]Joseph Holsten2008-11-251-21/+106
| | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2008-11-254-1/+117
| |\
| | * Add a MessageEncryptor, just like MessageVerifier but using symmetric key ↵Michael Koziarski2008-11-254-1/+117
| | | | | | | | | | | | | | | | | | | | | | | | encryption. The use of encryption prevents people from seeing any potentially secret values you've used. It also supports and encrypt_and_sign model to prevent people from tampering with the bits and creating random junk that gets fed to A motivated coder could use this to add an :encrypt=>true option to the cookie store.
| * | AS::Dependencies also has core extensions; don't autoload it.Jeremy Kemper2008-11-241-1/+1
| |/
| * Add config.preload_frameworks to load all frameworks at startup. Default to ↵Jeremy Kemper2008-11-241-2/+0
| | | | | | | | false so Rails autoloads itself as it's used.
| * JSON can't be autoloaded since it includes core extensionsJeremy Kemper2008-11-241-1/+1
| |
| * Require builder before fast_xs so we don't tickle its over-eager ↵Jeremy Kemper2008-11-241-1/+2
| | | | | | | | String#to_xs collision check
| * Explicitly require Builder in test that uses itJeremy Kemper2008-11-241-0/+1
| |
| * Revert "Hack builder to look for fast_xs instead of insisting on its own ↵Jeremy Kemper2008-11-242-3/+2
| | | | | | | | | | | | String#to_xs" This reverts commit 5d3712a81e502f46b2745d238d9bb76fcdb31f5b.
| * Allow optional arguments and/or block for Object#try like Object#send does. ↵Eloy Duran2008-11-242-2/+14
| | | | | | | | | | | | | | | | [#1425 state:resolved] Original suggestion by Pat Nakajima. Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * require json lib when serialization is loadedJoshua Peek2008-11-241-1/+1
| |
| * Add LAZY env flag for testing autoload/lazy load featureJoshua Peek2008-11-241-1/+1
| |
| * Autoload more ActiveSupport libsJoshua Peek2008-11-241-22/+19
| |
| * Autoload ActiveSupport::Duration, Gzip, OptionMerger, OrderedHash, ↵Jeremy Kemper2008-11-231-17/+14
| | | | | | | | OrderedOptions, StringInquirer, TimeWithZone, and TimeZone also
| * Autoload cache storesJeremy Kemper2008-11-231-6/+7
| |
| * Duration requires BasicObject in case it's autoloaded earlyJeremy Kemper2008-11-231-0/+2
| |