aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
Commit message (Collapse)AuthorAgeFilesLines
* re-organized test for merge into separate testsPaul Barry2010-06-131-13/+21
| | | | Signed-off-by: Xavier Noria <fxn@hashref.com>
* Support passing a block to ActiveSupport::OrderedHash's merge and merge! ↵Paul Mucur2010-06-133-3/+22
| | | | | | | | [#4838 state:committed] For better consistency with Ruby's own Hash implementation. Signed-off-by: Xavier Noria <fxn@hashref.com>
* require conversions to use String#ordSantiago Pastorino2010-06-121-0/+1
|
* registers 4146a44 in CHANGELOGXavier Noria2010-06-121-0/+5
|
* No need to call convert_key before except.José Valim2010-06-121-1/+0
|
* Simplify and optimize callbacks superclass sync.José Valim2010-06-121-54/+21
|
* Date#since, #ago, #beginning_of_day, #end_of_day, #xmlschema return ↵Geoff Buesing2010-06-123-6/+65
| | | | | | TimeWithZone when Time.zone_default is set Signed-off-by: Xavier Noria <fxn@hashref.com>
* Remove String#constantize depsJeremy Kemper2010-06-112-8/+9
|
* Explicitly delegate Chars#<=> to work around Kernel#<=> possibly ignoring ↵Jeremy Kemper2010-06-111-3/+4
| | | | method_missing
* Get ready for beta 4David Heinemeier Hansson2010-06-082-2/+2
|
* Missing require restoredwycats2010-06-081-0/+1
|
* Require encoding.rbwycats2010-06-081-0/+1
|
* Move the undef into the 1.9 only branchwycats2010-06-071-2/+2
|
* Merge remote branch 'rsim/oracle_enhanced_rails3'wycats2010-06-073-6/+6
|\
| * fix conditions when DateTime#to_date and DateTime#xmlschema methods are definedRaimonds Simanovskis2010-06-043-6/+6
| |
* | If we undef <=>, it solves a problem involving comparison. Please figure out ↵wycats2010-06-071-0/+2
| | | | | | | | the root cause.
* | Fixed Load Error failures in 1.9.2-headRizwan Reza2010-06-071-0/+1
| |
* | oops, two cancelling errors made a previous test pass, fixing itXavier Noria2010-06-071-1/+1
| |
* | the order in which we apply deltas in Date#advance matters, add test ↵Xavier Noria2010-06-071-0/+10
| | | | | | | | coverage for that
* | Clear const references all at onceJeremy Kemper2010-06-051-6/+9
| |
* | ActiveSupport::Dependencies.constantize shortcut for caching named constant ↵Jeremy Kemper2010-06-054-14/+26
| | | | | | | | lookups
* | Optimize LookupContextwycats2010-06-042-0/+38
| |
* | Small optimization of 1.9 unescape. We should make sure that inbound ASCII ↵wycats2010-06-041-2/+6
| | | | | | | | always means UTF-8. It seems so based on a quick survey of common browsers, but let's be sure
* | Improve performance of MessageVerifier while keeping it constant timewycats2010-06-041-4/+4
| |
* | Eliminate the need to check for superclass changes to the callback stack ↵wycats2010-06-041-3/+6
| | | | | | | | each time through the callbacks
* | removes Array#random_element and backports Array#sample from Ruby 1.9, ↵Xavier Noria2010-06-053-12/+42
|/ | | | thanks to Marc-Andre Lafortune
* Merge branch 'master' of github.com:rails/railsDavid Heinemeier Hansson2010-06-021-13/+9
|\
| * revises the documentation of String#truncate and the truncate helperXavier Noria2010-06-021-13/+9
| |
* | You need the ruby-debug available in your Gemfile for debugger to workDavid Heinemeier Hansson2010-06-021-1/+1
|/
* Merge branch 'master' of github.com:rails/railsDavid Heinemeier Hansson2010-06-016-8/+21
|\
| * Unforce memcache from ASSantiago Pastorino2010-06-012-3/+6
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
| * Unforce builder from ASSantiago Pastorino2010-06-014-3/+8
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
| * Unforce tzinfo from ASSantiago Pastorino2010-06-012-2/+7
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* | Extracted String#truncate from TextHelper#truncate [DHH]David Heinemeier Hansson2010-06-013-0/+64
|/
* Unforce i18n from ASSantiago Pastorino2010-05-314-6/+17
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Use I18n 0.4.0José Valim2010-05-271-1/+1
|
* Merge remote branch 'rails/master'Xavier Noria2010-05-2724-742/+753
|\
| * Fix test incorrectly using a bare assert to use assert_kind_ofSantiago Pastorino2010-05-241-1/+1
| | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Fix a bug where I18n fallbacks modules where not included in the proper ↵José Valim2010-05-231-2/+3
| | | | | | | | backend if it was set through config.i18n.backend.
| * Use multibyte proxy class on 1.9, refactor Unicode.Norman Clarke2010-05-2113-701/+715
| | | | | | | | | | | | | | | | | | | | Makes String#mb_chars on Ruby 1.9 return an instance of ActiveSupport::Multibyte::Chars to work around 1.9's lack of Unicode case folding. Refactors class methods from ActiveSupport::Multibyte::Chars into new Unicode module, adding other related functionality for consistency. [#4594 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * 1.day should respond_to kind_of tooNeeraj Singh2010-05-212-0/+2
| | | | | | | | | | | | [#4656 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
| * refactor evals and adds some __FILE__ and __LINE__Santiago Pastorino2010-05-207-38/+32
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* | A small rdoc change made on lines 39 and 41 on ↵jacortinas2010-05-251-2/+2
|/ | | | activesupport/lib/active_support/core_ext/object/to_param.rb. It looks like the method name might have been changed, and the comments were never changed to coincide with the new method name.
* Merge remote branch 'rails/master'Xavier Noria2010-05-1923-104/+74
|\
| * Final iteration of use better testing methodsNeeraj Singh2010-05-1913-44/+44
| | | | | | | | | | | | [#4652 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
| * removes deprecations of last_(month|year) from master, they will be ↵Xavier Noria2010-05-195-39/+1
| | | | | | | | deprecated in 2.3 instead
| * Better error messages for some of ActiveSupport testsNeeraj Singh2010-05-181-6/+6
| | | | | | | | | | | | [#4635 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
| * Renames Array#rand -> Array#random_elementRizwan Reza2010-05-173-15/+3
| | | | | | | | Signed-off-by: Xavier Noria <fxn@hashref.com>
| * Revert "Moved encoding work in progress to a feature branch."wycats2010-05-173-0/+20
| | | | | | | | This reverts commit ade756fe42423033bae8e5aea8f58782f7a6c517.
* | in Ruby things in general happen at runtime, no need to specify thatXavier Noria2010-05-191-2/+3
| |