Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | BigDecimal to_s and yaml housekeeping | Jeremy Kemper | 2008-09-08 | 1 | -22/+18 | |
| | | ||||||
| * | Ruby 1.9 compat: use method_defined? instead of instance_methods.include? ↵ | Jeremy Kemper | 2008-09-06 | 1 | -3/+6 | |
| | | | | | | | | Don't encourage args abuse by flattening. | |||||
* | | Merge commit 'mainstream/master' | Pratik Naik | 2008-09-05 | 5 | -8/+21 | |
|\| | ||||||
| * | Changed all benchmarking reports to be in milliseconds | David Heinemeier Hansson | 2008-09-05 | 2 | -1/+3 | |
| | | ||||||
| * | Deprecate %d and %s in message interpolation, but only in the bundled i18n lib. | Jeremy Kemper | 2008-09-04 | 1 | -2/+7 | |
| | | ||||||
| * | Handle the case where there is no ivar set. | Michael Koziarski | 2008-09-04 | 1 | -1/+1 | |
| | | | | | | | | This happens on jruby due to a bug, but also on historically marshalled data. | |||||
| * | Don't run 32bit dependant assertions in 64bit environments | Tarmo Tänav | 2008-09-04 | 1 | -4/+10 | |
| | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> | |||||
| * | Merge docrails | Pratik Naik | 2008-09-03 | 1 | -0/+10 | |
| | | ||||||
* | | Changed variable names for in_groups_of to make more obvious | Alan Harper | 2008-09-04 | 1 | -6/+6 | |
| | | ||||||
* | | Merge commit 'mainstream/master' | Pratik Naik | 2008-09-03 | 23 | -210/+457 | |
|\| | | | | | | | | | | | Conflicts: actionpack/lib/action_controller/resources.rb | |||||
| * | Add each_with_object from 1.9 for a more convenient alternative to inject. | Adam Keys | 2008-09-03 | 2 | -1/+26 | |
| | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#962 state:committed] | |||||
| * | Whitespace. | Clemens Kofler | 2008-09-03 | 1 | -5/+5 | |
| | | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
| * | Database connections are now pooled, one pool per #establish_connection call. | Jeremy Kemper | 2008-09-02 | 15 | -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 Koziarski | 2008-09-02 | 2 | -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 Kemper | 2008-08-31 | 8 | -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 performance | Sven Fuchs | 2008-08-30 | 1 | -17/+20 | |
| | | | | | | | | | | | | | | | | | | [#943 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
| | * | Fix test to not assume which thread finishes first | Jeremy Kemper | 2008-08-29 | 1 | -1/+2 | |
| | | | ||||||
| | * | Move some core extension methods into a module under the ↵ | Hongli Lai (Phusion) | 2008-08-29 | 4 | -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 also | Nick | 2008-08-29 | 1 | -2/+2 | |
| | | | ||||||
| * | | Module#synchronize: Add testcase to ensure that singleton methods can be wrapped | Nick | 2008-08-29 | 2 | -4/+17 | |
| | | | ||||||
| * | | Add method punctuation handling to #synchronize | Nick | 2008-08-29 | 2 | -3/+19 | |
| | | | ||||||
| * | | Adds Module#synchronize for easier method-level synchronization. | Nick | 2008-08-29 | 3 | -0/+93 | |
| |/ | ||||||
| * | Deprecate render_component. | Pratik Naik | 2008-08-29 | 1 | -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.9 | Jeremy Kemper | 2008-08-28 | 1 | -7/+11 | |
| | | ||||||
| * | Date#freeze bug doesn't affect Ruby 1.9 | Jeremy Kemper | 2008-08-28 | 1 | -8/+17 | |
| | | ||||||
| * | Merge branch 'master' of git@github.com:rails/rails | Jeremy Kemper | 2008-08-28 | 1 | -0/+16 | |
| |\ | ||||||
| | * | Deprecated implicit local assignments when rendering partials | Joshua Peek | 2008-08-28 | 1 | -0/+16 | |
| | | | ||||||
| * | | Reinstate Range#step default argument. | Bradford Folkens | 2008-08-27 | 1 | -2/+2 | |
| |/ | | | | | | | | | | | [#595 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
* | | Merge commit 'mainstream/master' | Pratik Naik | 2008-08-28 | 42 | -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 Kemper | 2008-08-27 | 3 | -23/+5 | |
| |\ | | | | | | | | | | | | | Conflicts: activesupport/lib/active_support.rb | |||||
| | * | I18n: remove #populate from Simple backend as well | Marko Seppae | 2008-08-27 | 1 | -7/+0 | |
| | | | ||||||
| | * | I18n: removed call to #populate from main library files | Marko Seppae | 2008-08-27 | 1 | -3/+1 | |
| | | | ||||||
| | * | I18n: removed #populate and #store_translations from api | Marko Seppae | 2008-08-27 | 2 | -13/+4 | |
| | | | ||||||
| * | | Moved Logger extensions into core_ext | Joshua Peek | 2008-08-27 | 3 | -129/+128 | |
| | | | ||||||
| * | | Fix Ruby's Time marshaling bug in pre-1.9 versions of Ruby: utc instances ↵ | Luca Guidi | 2008-08-27 | 3 | -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 (Phusion | 2008-08-27 | 3 | -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_accessor | Jeremy Kemper | 2008-08-25 | 1 | -8/+9 | |
| | | ||||||
| * | Harmonize framework require strategy. Don't add self to load path since ↵ | Jeremy Kemper | 2008-08-25 | 1 | -2/+0 | |
| | | | | | | | | Rails initializer and RubyGems handle it. | |||||
| * | Work around frozen Date memoization | Jeremy Kemper | 2008-08-25 | 2 | -4/+28 | |
| | | ||||||
| * | update i18n gem | Sven Fuchs | 2008-08-25 | 2 | -175/+173 | |
| | | ||||||
| * | Ruby 1.9 compat: update bundled i18n lib | Jeremy Kemper | 2008-08-23 | 2 | -168/+174 | |
| | | ||||||
| * | Ruby 1.9: silence some warnings for block args shadowing local vars | Jeremy Kemper | 2008-08-23 | 2 | -7/+7 | |
| | | ||||||
| * | Ruby 1.9: constantize takes advantage of new inherit arg to const_get and ↵ | Jeremy Kemper | 2008-08-23 | 1 | -24/+39 | |
| | | | | | | | | const_defined? | |||||
| * | I18n: use :other instead of :many as default key for pluralization to better ↵ | Sven Fuchs | 2008-08-23 | 1 | -1/+1 | |
| | | | | | | | | | | | | conform w/ cldr pluralization rules Signed-off-by: Michael Koziarski <michael@koziarski.com> | |||||
| * | New inflectors will overwrite defaults [#337 state:resolved] | Peter Wagenet | 2008-08-23 | 2 | -0/+13 | |
| | | | | | | | | Signed-off-by: Tarmo Tänav <tarmo@itech.ee> | |||||
| * | Pass class through to DeprecatedConstantProxy target | Tarmo Tänav | 2008-08-23 | 1 | -0/+4 | |
| | | | | | | | | | | | | | | This is needed because include_all_modules_from checks calls "class" on every constant and sometimes it can hit deprecated constants which aren't even Modules, but while checking for it deprecation warnings are shown. | |||||
| * | Merge branch 'master' into i18n | Jeremy Kemper | 2008-08-22 | 3 | -1/+9 | |
| |\ | ||||||
| | * | camelize(:lower) should always downcase first character. [#696 state:resolved] | Amos King | 2008-08-22 | 3 | -1/+9 | |
| | | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | |||||
| * | | Merge commit 'sven/i18n' into i18n | Jeremy Kemper | 2008-08-22 | 15 | -872/+245 | |
| |\ \ | | |/ | |/| | ||||||
| | * | Merge branch 'master' into i18n | Sven Fuchs | 2008-08-21 | 17 | -161/+271 | |
| | |\ |