aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git://github.com/rails/railsJosé Valim2009-07-2811-14/+18
|\
| * Merge docrailsPratik Naik2009-07-2511-14/+18
| |
* | Solving merge conflicts.José Valim2009-07-213-79/+89
|\|
| * Ruby 1.9.2 compat: name method was renamed to __name__ since MiniTest 1.4.x ↵Akira Matsuda2009-07-211-1/+2
| | | | | | | | | | | | [#2922 state:resolved] Signed-off-by: Yehuda Katz <wycats@gmail.com>
| * * don't include String#% for Ruby 1.9Sven Fuchs2009-07-182-78/+87
| | | | | | | | | | | | | | | | | | | | * raise a KeyError exception for missing named interpolation args (like Ruby 1.9 does) * raise an ArgumentError when mixing named and unnamed placeholders (like Ruby 1.9 does) * improve docs and comply a bit more w/ Rails names/conventions [#2870 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* | Merge branch 'master' of git://github.com/rails/railsJosé Valim2009-07-164-4/+8
|\|
| * ActiveSupport Hash optimizations [#2902 state:resolved]Lourens Naude2009-07-154-4/+8
| | | | | | | | Signed-off-by: Carl Lerche <carllerche@mac.com>
* | Merge branch 'master' of git://github.com/rails/railsJosé Valim2009-07-085-75/+226
|\|
| * Use the i18n gem if present instead of vendor code. [#2871 state:resolved]Lawrence Pit2009-07-071-5/+4
| | | | | | | | Signed-off-by: Yehuda Katz <wycats@gmail.com>
| * Ruby 1.9 style String interpolation support for lower ruby versions. Thanks ↵Lawrence Pit2009-07-073-0/+150
| | | | | | | | | | | | to code from Masao Mutoh's GetText gem. [#2870 state:resolved] Signed-off-by: Yehuda Katz <wycats@yehuda-katzs-macbookpro41.local>
| * Get Initializer tests running without requiring parts of Rails being loaded ↵Yehuda Katz + Carl Lerche2009-07-061-70/+72
| | | | | | | | first
* | Use active_support/mini since we just need inflections.José Valim2009-07-061-2/+2
| |
* | Merge branch 'master' of git://github.com/rails/railsJosé Valim2009-07-037-10/+68
|\|
| * Adds support for def self.setup in isolation tests for setup that should be ↵Yehuda Katz + Carl Lerche2009-07-022-2/+20
| | | | | | | | run only once in the parent
| * Fixed ActiveSupport::OrderedHash::[] work identically to ::Hash::[] in ruby ↵Brian Abreu2009-07-022-5/+42
| | | | | | | | | | | | 1.8.7 [#2832 state:resolved] Signed-off-by: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>
| * wycats forgot a +1, so I added it [#2749 state:resolved]Aaron Patterson2009-07-021-1/+1
| | | | | | | | Signed-off-by: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>
| * make #inspect if zero length duration return '0 seconds' instead of empty ↵Levin Alexander2009-07-022-2/+5
| | | | | | | | | | | | string [#2838 state:resolved] Signed-off-by: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>
* | Merge branch 'master' of git://github.com/rails/railsJosé Valim2009-07-0221-42/+337
|\|
| * Fixes bug where Memcached connections get corrupted when an invalid expire ↵Yehuda Katz + Carl Lerche2009-07-012-2/+30
| | | | | | | | is passed in [#2854 state:resolved]
| * JSON.escape returns UTF-8 stringsJeremy Kemper2009-07-012-7/+14
| | | | | | | | [#2849 state:resolved]
| * uses Hash#except/sliceJeremy Kemper2009-07-011-0/+2
| |
| * Forgot to commit the new file. This is slightly embarrassing.Yehuda Katz + Carl Lerche2009-07-011-0/+2
| |
| * Apparently stdlib isn't std enoughYehuda Katz + Carl Lerche2009-07-011-4/+6
| |
| * Modify isolation test to require a file not in use anywhere in RailsYehuda Katz + Carl Lerche2009-07-011-4/+4
| |
| * Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2009-07-0118-35/+319
| |\
| | * Original cache objects should not be immutable [#2860 state:resolved]Yehuda Katz + Carl Lerche2009-07-012-1/+7
| | | | | | | | | Signed-off-by: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>
| | * ensure Inflector.camelize works with symbols [#2856 state:resolved]Yehuda Katz + Carl Lerche2009-07-013-1/+14
| | | | | | | | | Signed-off-by: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>
| | * Move mocha down below initial T::U require and bump version to 0.9.7 [#2858 ↵Yehuda Katz + Carl Lerche2009-07-015-15/+9
| | | | | | | | | | | | state:resolved]
| | * Crazy hacks to get the Isolation testing module to work on non forking ↵Yehuda Katz + Carl Lerche2009-06-302-10/+71
| | | | | | | | | | | | environments
| | * Bump up the version to 3.0.preCarl Lerche2009-06-301-3/+3
| | |
| | * Created AS::Testing::Isolation which runs each test case in a separate process.Yehuda Katz + Carl Lerche2009-06-303-0/+181
| | | | | | | | | | | | | | | This allows for testing rails bootup (files are required, correct constants are set, etc...). Currently, this is implemented via forking only, but we will add support for jruby and windows shortly.
| | * Remove stray checks for Rspec in the testing setup.Carl Lerche2009-06-302-8/+0
| | |
| * | Friendlier runtime exception if delegatee is nilJeremy Kemper2009-06-182-4/+10
| | |
| * | Delegated methods report the expected file/line in backtracesJeremy Kemper2009-06-181-2/+3
| | |
* | | Merge branch 'master' of git://github.com/rails/railsJosé Valim2009-06-261-1/+6
|\ \ \ | | |/ | |/|
| * | Try speeding up rails bootingYehuda Katz + Carl Lerche2009-06-251-1/+6
| | |
* | | Merge branch 'master' of git://github.com/rails/railsJosé Valim2009-06-234-7/+39
|\| |
| * | Use stubbing instead of sleep() in File store cache testsPratik Naik2009-06-211-3/+9
| | |
| * | Add expiry support File cache store [#1693 state:resolved] [Roman ↵Pratik Naik2009-06-214-7/+33
| |/ | | | | | | Shterenzon, Pratik Naik]
* | Merge branch 'master' of git://github.com/rails/railsJosé Valim2009-06-195-54/+6
|\|
| * Add basic JSON serializer to AMoJoshua Peek2009-06-172-0/+6
| |
| * Move model naming into ActiveModelJoshua Peek2009-06-173-54/+0
| |
* | Convert line breaks.José Valim2009-06-171-55/+55
|/
* Require missing file in ASYehuda Katz + Carl Lerche2009-06-151-0/+2
|
* Fix failing tests in new callbacksYehuda Katz + Carl Lerche2009-06-151-1/+1
|
* moves reopening of core classes to add generic stuff from Action Pack to ↵Xavier Noria2009-06-139-0/+89
| | | | | | | | AS/core_ext and adds tests [#2798 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Bytes calculation speed upLuca Guidi2009-06-131-8/+15
| | | | | | [#2800 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* uses Object#metaclass and Object#class_eval in a few spotsXavier Noria2009-06-122-2/+2
| | | | | | [#2797 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Simplify helper use of ActiveSupport::Dependencies, and use super better for ↵Yehuda Katz + Carl Lerche2009-06-101-5/+10
| | | | in #helpers
* enable *real* IO parsing for the libxml, nokogiri and rexml backends [#2659 ↵Brian Lopez2009-06-093-16/+26
| | | | | | state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>