codafoo / rails fork watch download tarball
public
Fork of rails/rails
Description: Ruby on Rails
Homepage: http://rubyonrails.org
Clone URL: git://github.com/codafoo/rails.git
rails / Commit History feed

11/18/08

Merge branch 'master' of git://github.com/rails/rails into rails/master
codafoo (author)
Tue Nov 18 00:05:43 -0800 2008
commit  c5b0497951a97c8bafce38e7359298c99a213f25
tree    bc169fbb0d7fb713fb93bfe9c927af5c39bb37ec
parent  a42d432de404230a4dcbdeb037cd498bb4a506f0 parent  75fb8dfb996f5c5d8b64d10ce7b27eeb681d5316

11/17/08

Prevent assert_template failures when a render :inline is called before 
rendering a file-based template [#1383 state:resolved]
lukemelia (author)
Mon Nov 17 20:09:22 -0800 2008
josh (committer)
Mon Nov 17 20:09:22 -0800 2008
commit  75fb8dfb996f5c5d8b64d10ce7b27eeb681d5316
tree    15727c7772ea669c48ce33d1f94a1da0fbc0be57
parent  3c9beb3dab73013af83b90983f283b76625052b8 
Add helper test generators [#1199 state:resolved]
eugenebolshakov (author)
Mon Nov 17 19:55:56 -0800 2008
josh (committer)
Mon Nov 17 19:56:39 -0800 2008
commit  3c9beb3dab73013af83b90983f283b76625052b8
tree    ab5c1eabfe79142bfbac484abf31157516b751b3
parent  d22fe41cf87d781ce1af264b37ba3eca762b74c3 
Fix a typo in test helper
lifo (author)
Mon Nov 17 19:10:38 -0800 2008
commit  d22fe41cf87d781ce1af264b37ba3eca762b74c3
tree    507d788eebf7873a854d99d351c9840579ca4f4e
parent  3319fa69655744678e9458b4c585958f5d3956b1 
Dont require 'application' when running tests
lifo (author)
Mon Nov 17 19:08:01 -0800 2008
commit  3319fa69655744678e9458b4c585958f5d3956b1
tree    5a9910e475fc49522996fe96bd84caff38340f4c
parent  8f71d6bcf621389ee8bb23a4a4d2a074906cdbfe 
Fix script/console
lifo (author)
Mon Nov 17 18:58:26 -0800 2008
commit  8f71d6bcf621389ee8bb23a4a4d2a074906cdbfe
tree    913d3f369b47c36994a3aa120be11ee97cff5c54
parent  5c841511863640b2c8da8b542dda946b1abba44d 
Merge branch 'master' of git@github.com:rails/rails
jeremy (author)
Mon Nov 17 15:28:17 -0800 2008
commit  5c841511863640b2c8da8b542dda946b1abba44d
tree    2d26e815d2152c7dac70062429e53081e8f9b9e4
parent  5a4789e86adf73ba3757caa9111c3b5ad481b940 parent  32cb2345a54b9ab38461b2d4bb0dbd1706f2800e 
Explicitly require test/unit so tests autorun
jeremy (author)
Mon Nov 17 15:18:01 -0800 2008
commit  5a4789e86adf73ba3757caa9111c3b5ad481b940
tree    3addb3fec2db315a6f983722182ee064607aafe8
parent  3a33ee28e9babc5a1a78079f5ca50ea6249f2643 
Fix default_scope to work in combination with named scopes
tomstuart (author)
Mon Nov 17 12:10:59 -0800 2008
dhh (committer)
Mon Nov 17 13:00:14 -0800 2008
commit  32cb2345a54b9ab38461b2d4bb0dbd1706f2800e
tree    9da1d7efd04f2f589c777699e2d3c6274820d4be
parent  3a33ee28e9babc5a1a78079f5ca50ea6249f2643 
Fix compatibility with Ruby 1.8 that also has the Miniunit gem installed.
Hongli Lai (Phusion) (author)
Mon Nov 17 12:28:43 -0800 2008
jeremy (committer)
Mon Nov 17 12:38:47 -0800 2008
commit  3a33ee28e9babc5a1a78079f5ca50ea6249f2643
tree    f9e357ca29694361c7c473c17958bd4ce235c351
parent  2ace3d9154aa66aab66e1f7db2a2a309d1336b8b 
Explicitly require AS::Duration
jeremy (author)
Mon Nov 17 11:38:24 -0800 2008
commit  2ace3d9154aa66aab66e1f7db2a2a309d1336b8b
tree    a851150ef191abc7801d68b16f9f0d5b23c1f571
parent  8412200f90c239cbf12bb32b5246d0104306f6c2 
Change usage of defined? to check the rubygems constant existance by a 
rescue block on boot.rb for Ruby 1.9 compatibility
carlosparamio (author)
Tue Nov 04 11:32:52 -0800 2008
jeremy (committer)
Mon Nov 17 10:53:18 -0800 2008
commit  8412200f90c239cbf12bb32b5246d0104306f6c2
tree    051df5c7251c650d36d000f13d0fe05632fc7482
parent  e3fcf9b66889caba7852e273de778e0e52c6585c 
Use ActiveSupport::TestCase in generated test/test_helper.rb
jeremy (author)
Mon Nov 17 10:39:46 -0800 2008
commit  e3fcf9b66889caba7852e273de778e0e52c6585c
tree    8aca255274498a98c9f9ee9cac52e72100820635
parent  435b088f5aa5d6bc38369dd9c9d067e21e5b7de1 
Merge branch 'master' of git@github.com:rails/rails
jeremy (author)
Mon Nov 17 10:36:02 -0800 2008
commit  435b088f5aa5d6bc38369dd9c9d067e21e5b7de1
tree    3f64164d58791c4762c5fc5d4ca5240e0aecfebf
parent  6ff506ffbc438a92cb6d3cb4351a0a463d57424a parent  fcce1f17eaf9993b0210fe8e2a8117b61a1f0f69 
BACKWARDS INCOMPATIBLE: Renamed application.rb to 
application_controller.rb and removed all the special casing that was in 
place to support the former. You must do this rename in your own 
application when you upgrade to this version [DHH]
dhh (author)
Mon Nov 17 10:16:31 -0800 2008
commit  fcce1f17eaf9993b0210fe8e2a8117b61a1f0f69
tree    dcf89fab841f873dd9c26b3f061f7d1c4e378f86
parent  4b33fae1f52325d22083de2e83d827b924d1c616 
Merge branch 'master' of git@github.com:rails/rails
jeremy (author)
Mon Nov 17 10:17:42 -0800 2008
commit  6ff506ffbc438a92cb6d3cb4351a0a463d57424a
tree    b00760f78a94ea0f226cf825f26ef6db8890fdc5
parent  29a31912fcedde9e271af8a20b890f8c62e1ea79 parent  4b33fae1f52325d22083de2e83d827b924d1c616 
Fixed RedCloth and BlueCloth shouldn't preload. Instead just assume that 
they're available if you want to use textilize and markdown and let 
autoload require them [DHH]
dhh (author)
Mon Nov 17 09:31:36 -0800 2008
commit  4b33fae1f52325d22083de2e83d827b924d1c616
tree    f711359d914811c4e7fbdbd3a992f2ffc41fc8da
parent  54c18564252e46bf2f270bf42c0be06033631d9b

11/16/08

The inflector is meant to work on words not phrases -- dont confuse people 
with a phrase example
dhh (author)
Sun Nov 16 12:29:48 -0800 2008
commit  54c18564252e46bf2f270bf42c0be06033631d9b
tree    58190e53c6e3831a5903622325f7360d27b386bd
parent  e6c51051e4bbc1483ecc9e0837bb893197bbca83 
Ensure shared default_scoping stack is duped before assigning to thread 
local
josh (author)
Sun Nov 16 11:51:04 -0800 2008
commit  e6c51051e4bbc1483ecc9e0837bb893197bbca83
tree    a272589611a58b407d8dc47bb1959ed0982639e9
parent  8c197fb4ab4fa432a6e9421e0339a17a7ec296f1 
Add text/plain to the browser_generated_types array as webkit and gecko 
can submit them.
NZKoz (author)
Sun Nov 16 11:19:02 -0800 2008
commit  8c197fb4ab4fa432a6e9421e0339a17a7ec296f1
tree    5efbb2355fa3a461d75e18139cfbb429b75eb012
parent  2530d0eea8eaecd2c61f99225f050ff47973e9a0 
Added default_scope to Base [#1381 state:committed] (Paweł Kondzior)
lifo (author)
Sun Nov 16 10:06:41 -0800 2008
commit  2530d0eea8eaecd2c61f99225f050ff47973e9a0
tree    e32d4920a21417e79584c6c7a563a2cb948b4532
parent  d9f460a39b73fd2cf0f17f523cc4810d0bf44cac 
Ensure @@already_loaded_fixtures is initialized before use
lifo (author)
Sun Nov 16 08:51:05 -0800 2008
commit  d9f460a39b73fd2cf0f17f523cc4810d0bf44cac
tree    34ca8c3020bcb01f568674ba358b9652830007e0
parent  ca23287b448c2e007a5c93e43e762a10e0007b7a 
Revert "Added default_scope to Base [#1381 state:committed] (Paweł K
ondzior)" -- won't gel with threads.
dhh (author)
Sun Nov 16 07:35:52 -0800 2008
commit  ca23287b448c2e007a5c93e43e762a10e0007b7a
tree    ff9bbd2f8e62d859b49d4afe6a3b552db648c804
parent  ff594b2bc94ff2a942fe6ca05672387722dee686 
Added default_scope to Base [#1381 state:committed] (Paweł Kondzior)
dhh (author)
Sun Nov 16 07:01:18 -0800 2008
commit  ff594b2bc94ff2a942fe6ca05672387722dee686
tree    bac4e060858eb2fdab50401a6cef1b2196bed452
parent  c5448c75abd7b69618346fe62deb7a7a3442f4e8

11/15/08

Lazy-require state machine internals when the module is included
jeremy (author)
Sat Nov 15 21:05:03 -0800 2008
commit  29a31912fcedde9e271af8a20b890f8c62e1ea79
tree    8c1d72fa399d7f60e22eef9e63a87dec2494df25
parent  d7bad6e2eba5b5ea0d83a4a2a4390b057c39ec7a 
Use the Ruby load path for test_helper requires. Fix AM::TestCase.
jeremy (author)
Sat Nov 15 20:25:14 -0800 2008
commit  d7bad6e2eba5b5ea0d83a4a2a4390b057c39ec7a
tree    c22938f72fb2c26d3208ad44465df287e1b477c2
parent  9e9dde617f45c24c2cf3193f639b2a9eb0332a34 
Require callbacks so AS::TestCase may be required in isolation
jeremy (author)
Sat Nov 15 19:07:57 -0800 2008
commit  9e9dde617f45c24c2cf3193f639b2a9eb0332a34
tree    73480c7f73f727f29ff7fbc9c8ee4f0d78662f1b
parent  c5448c75abd7b69618346fe62deb7a7a3442f4e8 
Switch to AS::TestCase for assert_deprecated
jeremy (author)
Sat Nov 15 13:28:46 -0800 2008
commit  c5448c75abd7b69618346fe62deb7a7a3442f4e8
tree    ff9bbd2f8e62d859b49d4afe6a3b552db648c804
parent  5fe543b6294df44d0e7670b78347564874a2f5e2 
Add create_fixtures method for tests
jeremy (author)
Sat Nov 15 12:31:54 -0800 2008
commit  5fe543b6294df44d0e7670b78347564874a2f5e2
tree    754bdea6c26bed8ede3c64d639ffac2de998f4bf
parent  160b8a83444cd3784cba2396435ef06dba234122 
Set up fixtures for AR tests
jeremy (author)
Sat Nov 15 12:30:02 -0800 2008
commit  160b8a83444cd3784cba2396435ef06dba234122
tree    bd82aac618f8bcb14e200b95bee6709161145695
parent  0cd9b149e2e8af10f835718018cf009ebc4f9fda