Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Enumerable#sum now works will all enumerables, even if they don't respond to ↵ | Marc-Andre Lafortune | 2009-08-08 | 2 | -4/+6 | |
| | | | | | | | | :size [#2489 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
* | Fixed a bug in JSON decoding with Yaml backend, where a combination of ↵ | Bas Van Klinkenberg | 2009-08-08 | 2 | -8/+17 | |
| | | | | | | dates, escaped or unicode encoded data and arrays would make the parser fail with a ParseError exception. [#2831 state:resolved] Signed-off-by: Yehuda Katz <wycats@gmail.com> | |||||
* | Extract String#bytesize shim | Jeremy Kemper | 2009-08-01 | 3 | -3/+14 | |
| | ||||||
* | Merge branch 'master' of git://github.com/rails/rails | José Valim | 2009-07-28 | 11 | -14/+18 | |
|\ | ||||||
| * | Merge docrails | Pratik Naik | 2009-07-25 | 11 | -14/+18 | |
| | | ||||||
* | | Solving merge conflicts. | José Valim | 2009-07-21 | 3 | -79/+89 | |
|\| | ||||||
| * | Ruby 1.9.2 compat: name method was renamed to __name__ since MiniTest 1.4.x ↵ | Akira Matsuda | 2009-07-21 | 1 | -1/+2 | |
| | | | | | | | | | | | | [#2922 state:resolved] Signed-off-by: Yehuda Katz <wycats@gmail.com> | |||||
| * | * don't include String#% for Ruby 1.9 | Sven Fuchs | 2009-07-18 | 2 | -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/rails | José Valim | 2009-07-16 | 4 | -4/+8 | |
|\| | ||||||
| * | ActiveSupport Hash optimizations [#2902 state:resolved] | Lourens Naude | 2009-07-15 | 4 | -4/+8 | |
| | | | | | | | | Signed-off-by: Carl Lerche <carllerche@mac.com> | |||||
* | | Merge branch 'master' of git://github.com/rails/rails | José Valim | 2009-07-08 | 5 | -75/+226 | |
|\| | ||||||
| * | Use the i18n gem if present instead of vendor code. [#2871 state:resolved] | Lawrence Pit | 2009-07-07 | 1 | -5/+4 | |
| | | | | | | | | Signed-off-by: Yehuda Katz <wycats@gmail.com> | |||||
| * | Ruby 1.9 style String interpolation support for lower ruby versions. Thanks ↵ | Lawrence Pit | 2009-07-07 | 3 | -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 Lerche | 2009-07-06 | 1 | -70/+72 | |
| | | | | | | | | first | |||||
* | | Use active_support/mini since we just need inflections. | José Valim | 2009-07-06 | 1 | -2/+2 | |
| | | ||||||
* | | Merge branch 'master' of git://github.com/rails/rails | José Valim | 2009-07-03 | 7 | -10/+68 | |
|\| | ||||||
| * | Adds support for def self.setup in isolation tests for setup that should be ↵ | Yehuda Katz + Carl Lerche | 2009-07-02 | 2 | -2/+20 | |
| | | | | | | | | run only once in the parent | |||||
| * | Fixed ActiveSupport::OrderedHash::[] work identically to ::Hash::[] in ruby ↵ | Brian Abreu | 2009-07-02 | 2 | -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 Patterson | 2009-07-02 | 1 | -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 Alexander | 2009-07-02 | 2 | -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/rails | José Valim | 2009-07-02 | 21 | -42/+337 | |
|\| | ||||||
| * | Fixes bug where Memcached connections get corrupted when an invalid expire ↵ | Yehuda Katz + Carl Lerche | 2009-07-01 | 2 | -2/+30 | |
| | | | | | | | | is passed in [#2854 state:resolved] | |||||
| * | JSON.escape returns UTF-8 strings | Jeremy Kemper | 2009-07-01 | 2 | -7/+14 | |
| | | | | | | | | [#2849 state:resolved] | |||||
| * | uses Hash#except/slice | Jeremy Kemper | 2009-07-01 | 1 | -0/+2 | |
| | | ||||||
| * | Forgot to commit the new file. This is slightly embarrassing. | Yehuda Katz + Carl Lerche | 2009-07-01 | 1 | -0/+2 | |
| | | ||||||
| * | Apparently stdlib isn't std enough | Yehuda Katz + Carl Lerche | 2009-07-01 | 1 | -4/+6 | |
| | | ||||||
| * | Modify isolation test to require a file not in use anywhere in Rails | Yehuda Katz + Carl Lerche | 2009-07-01 | 1 | -4/+4 | |
| | | ||||||
| * | Merge branch 'master' of git@github.com:rails/rails | Jeremy Kemper | 2009-07-01 | 18 | -35/+319 | |
| |\ | ||||||
| | * | Original cache objects should not be immutable [#2860 state:resolved] | Yehuda Katz + Carl Lerche | 2009-07-01 | 2 | -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 Lerche | 2009-07-01 | 3 | -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 Lerche | 2009-07-01 | 5 | -15/+9 | |
| | | | | | | | | | | | | state:resolved] | |||||
| | * | Crazy hacks to get the Isolation testing module to work on non forking ↵ | Yehuda Katz + Carl Lerche | 2009-06-30 | 2 | -10/+71 | |
| | | | | | | | | | | | | environments | |||||
| | * | Bump up the version to 3.0.pre | Carl Lerche | 2009-06-30 | 1 | -3/+3 | |
| | | | ||||||
| | * | Created AS::Testing::Isolation which runs each test case in a separate process. | Yehuda Katz + Carl Lerche | 2009-06-30 | 3 | -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 Lerche | 2009-06-30 | 2 | -8/+0 | |
| | | | ||||||
| * | | Friendlier runtime exception if delegatee is nil | Jeremy Kemper | 2009-06-18 | 2 | -4/+10 | |
| | | | ||||||
| * | | Delegated methods report the expected file/line in backtraces | Jeremy Kemper | 2009-06-18 | 1 | -2/+3 | |
| | | | ||||||
* | | | Merge branch 'master' of git://github.com/rails/rails | José Valim | 2009-06-26 | 1 | -1/+6 | |
|\ \ \ | | |/ | |/| | ||||||
| * | | Try speeding up rails booting | Yehuda Katz + Carl Lerche | 2009-06-25 | 1 | -1/+6 | |
| | | | ||||||
* | | | Merge branch 'master' of git://github.com/rails/rails | José Valim | 2009-06-23 | 4 | -7/+39 | |
|\| | | ||||||
| * | | Use stubbing instead of sleep() in File store cache tests | Pratik Naik | 2009-06-21 | 1 | -3/+9 | |
| | | | ||||||
| * | | Add expiry support File cache store [#1693 state:resolved] [Roman ↵ | Pratik Naik | 2009-06-21 | 4 | -7/+33 | |
| |/ | | | | | | | Shterenzon, Pratik Naik] | |||||
* | | Merge branch 'master' of git://github.com/rails/rails | José Valim | 2009-06-19 | 5 | -54/+6 | |
|\| | ||||||
| * | Add basic JSON serializer to AMo | Joshua Peek | 2009-06-17 | 2 | -0/+6 | |
| | | ||||||
| * | Move model naming into ActiveModel | Joshua Peek | 2009-06-17 | 3 | -54/+0 | |
| | | ||||||
* | | Convert line breaks. | José Valim | 2009-06-17 | 1 | -55/+55 | |
|/ | ||||||
* | Require missing file in AS | Yehuda Katz + Carl Lerche | 2009-06-15 | 1 | -0/+2 | |
| | ||||||
* | Fix failing tests in new callbacks | Yehuda Katz + Carl Lerche | 2009-06-15 | 1 | -1/+1 | |
| | ||||||
* | moves reopening of core classes to add generic stuff from Action Pack to ↵ | Xavier Noria | 2009-06-13 | 9 | -0/+89 | |
| | | | | | | | | AS/core_ext and adds tests [#2798 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
* | Bytes calculation speed up | Luca Guidi | 2009-06-13 | 1 | -8/+15 | |
| | | | | | | [#2800 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> |