aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'mainstream/master'Pratik Naik2008-09-1013-32/+83
|\
| * Added Inflector#parameterize for easy slug generation ("Donald E. ↵David Heinemeier Hansson2008-09-105-0/+51
| | | | | | | | Knuth".parameterize => "donald-e-knuth") #713 [Matt Darby]
| * No local variable in the global namespace plzDavid Heinemeier Hansson2008-09-091-3/+2
| |
| * Fixed that REXML fix would break on earlier versions of ruby (Frederick ↵David Heinemeier Hansson2008-09-091-1/+3
| | | | | | | | Cheung) [state:resolved #987]
| * Revert "Remove the Version check as it's not always available."David Heinemeier Hansson2008-09-091-20/+22
| | | | | | | | This reverts commit 6e2851d4261fbbea00e8e74802a507a89af80e2f.
| * Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2008-09-091-22/+20
| |\
| | * Remove the Version check as it's not always available.Michael Koziarski2008-09-091-22/+20
| | |
| * | Check whether memoized ivar is initializedJeremy Kemper2008-09-081-1/+1
| |/
| * Fix indentation mismatchJeremy Kemper2008-09-083-3/+3
| |
| * Don't shadow arg with block varJeremy Kemper2008-09-081-2/+2
| |
| * BigDecimal to_s and yaml housekeepingJeremy Kemper2008-09-081-22/+18
| |
| * Ruby 1.9 compat: use method_defined? instead of instance_methods.include? ↵Jeremy Kemper2008-09-061-3/+6
| | | | | | | | Don't encourage args abuse by flattening.
* | Merge commit 'mainstream/master'Pratik Naik2008-09-055-8/+21
|\|
| * Changed all benchmarking reports to be in millisecondsDavid Heinemeier Hansson2008-09-052-1/+3
| |
| * Deprecate %d and %s in message interpolation, but only in the bundled i18n lib.Jeremy Kemper2008-09-041-2/+7
| |
| * Handle the case where there is no ivar set.Michael Koziarski2008-09-041-1/+1
| | | | | | | | This happens on jruby due to a bug, but also on historically marshalled data.
| * Don't run 32bit dependant assertions in 64bit environmentsTarmo Tänav2008-09-041-4/+10
| | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com>
| * Merge docrailsPratik Naik2008-09-031-0/+10
| |
* | Changed variable names for in_groups_of to make more obviousAlan Harper2008-09-041-6/+6
| |
* | Merge commit 'mainstream/master'Pratik Naik2008-09-0323-210/+457
|\| | | | | | | | | | | Conflicts: actionpack/lib/action_controller/resources.rb
| * Add each_with_object from 1.9 for a more convenient alternative to inject.Adam Keys2008-09-032-1/+26
| | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#962 state:committed]
| * Whitespace.Clemens Kofler2008-09-031-5/+5
| | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Database connections are now pooled, one pool per #establish_connection call.Jeremy Kemper2008-09-0215-193/+264
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pools start out empty and grow as necessary to a maximum size (default is 5, configure size with key 'pool' in your database configuration). If no connections are available, a thread will wait up to a 'wait_timeout' time (default is 5 seconds). Connections are verified and reset when checked out from the pool (usually upon first access to ActiveRecord::Base.connection), and returned back to the pool after each request. If you would like to use connection pools outside of ActionPack, there is an ActiveRecord::Base.connection_pool method that gives you access to the pool, and you can manually checkout/checkin connections, or supply a block to ActiveRecord::Base.connection_pool.with_connection which takes care of the checkout/checkin for you. [#936 state:resolved]
| | * Merge rexml-expansion-fix gem into activesupport.Michael Koziarski2008-09-022-0/+56
| | | | | | | | | | | | | | | Addresses the security issue documented at: * http://www.ruby-lang.org/en/news/2008/08/23/dos-vulnerability-in-rexml/
| | * Get rid of 'Object#send!'. It was originally added because it's in Ruby 1.9, ↵Jeremy Kemper2008-08-318-27/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | but it has since been removed from 1.9. Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> Conflicts: actionpack/test/controller/layout_test.rb
| | * I18n: applied Luca Guidi's patch for better #interpolate performanceSven Fuchs2008-08-301-17/+20
| | | | | | | | | | | | | | | | | | [#943 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| | * Fix test to not assume which thread finishes firstJeremy Kemper2008-08-291-1/+2
| | |
| | * Move some core extension methods into a module under the ↵Hongli Lai (Phusion)2008-08-294-148/+165
| | | | | | | | | | | | | | | | | | | | | | | | ActiveSupport::CoreExtensions namespace, instead of extending core classes directly. This is more friendly for API reference generators. [#915 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * | Add synchronization to connection pool alsoNick2008-08-291-2/+2
| | |
| * | Module#synchronize: Add testcase to ensure that singleton methods can be wrappedNick2008-08-292-4/+17
| | |
| * | Add method punctuation handling to #synchronizeNick2008-08-292-3/+19
| | |
| * | Adds Module#synchronize for easier method-level synchronization.Nick2008-08-293-0/+93
| |/
| * Deprecate render_component.Pratik Naik2008-08-291-1/+1
| | | | | | | | | | Please install render_component plugin from http://github.com/rails/render_component/tree/master if your application uses this functionality.
| * Date#freeze bug doesn't affect Ruby 1.9Jeremy Kemper2008-08-281-7/+11
| |
| * Date#freeze bug doesn't affect Ruby 1.9Jeremy Kemper2008-08-281-8/+17
| |
| * Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2008-08-281-0/+16
| |\
| | * Deprecated implicit local assignments when rendering partialsJoshua Peek2008-08-281-0/+16
| | |
| * | Reinstate Range#step default argument.Bradford Folkens2008-08-271-2/+2
| |/ | | | | | | | | | | [#595 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* | Merge commit 'mainstream/master'Pratik Naik2008-08-2842-1183/+929
|\| | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/associations/association_proxy.rb activerecord/lib/active_record/callbacks.rb activeresource/lib/active_resource/base.rb
| * Merge commit 'sven/i18n'Jeremy Kemper2008-08-273-23/+5
| |\ | | | | | | | | | | | | Conflicts: activesupport/lib/active_support.rb
| | * I18n: remove #populate from Simple backend as wellMarko Seppae2008-08-271-7/+0
| | |
| | * I18n: removed call to #populate from main library filesMarko Seppae2008-08-271-3/+1
| | |
| | * I18n: removed #populate and #store_translations from apiMarko Seppae2008-08-272-13/+4
| | |
| * | Moved Logger extensions into core_extJoshua Peek2008-08-273-129/+128
| | |
| * | Fix Ruby's Time marshaling bug in pre-1.9 versions of Ruby: utc instances ↵Luca Guidi2008-08-273-1/+58
| | | | | | | | | | | | are now correctly unmarshaled with a utc zone instead of the system local zone [#900 state:resolved]
| * | Deprecate Rails::SecretKeyGenerator in favor of ActiveSupport::SecureRandom.Hongli Lai (Phusion2008-08-273-0/+214
| |/ | | | | | | | | | | | | SecureRandom has a few minor security enhancements and can be used as a drop-in replacement Signed-off-by: Michael Koziarski <michael@koziarski.com> [#913 state:committed]
| * Ruby 1.9 compat: switch profile_options to superclass_delegating_accessorJeremy Kemper2008-08-251-8/+9
| |
| * Harmonize framework require strategy. Don't add self to load path since ↵Jeremy Kemper2008-08-251-2/+0
| | | | | | | | Rails initializer and RubyGems handle it.
| * Work around frozen Date memoizationJeremy Kemper2008-08-252-4/+28
| |
| * update i18n gemSven Fuchs2008-08-252-175/+173
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-04 23:59:16 +0000