diff options
| author | wycats <wycats@gmail.com> | 2010-04-13 14:07:46 -0700 |
|---|---|---|
| committer | wycats <wycats@gmail.com> | 2010-04-13 14:07:46 -0700 |
| commit | 8e9df34fa3fd22719d939ba72f19b3ae9ffcc018 (patch) | |
| tree | fb7d56ee45fcf33ac78f6591e1fcd8d8de3a54c4 /actionpack | |
| parent | dc251389d1ab4303b80a22642f4241940b73cbe7 (diff) | |
| parent | b4fd5e6f1a00b7c2b482de3d3b99a27adeba5920 (diff) | |
| download | rails-8e9df34fa3fd22719d939ba72f19b3ae9ffcc018.tar.gz rails-8e9df34fa3fd22719d939ba72f19b3ae9ffcc018.tar.bz2 rails-8e9df34fa3fd22719d939ba72f19b3ae9ffcc018.zip | |
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
| -rw-r--r-- | actionpack/test/controller/layout_test.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 33084d539f..f221661c25 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,4 +1,4 @@ -*Rails 3.0.0 [beta 3] (pending)* +*Rails 3.0.0 [beta 3] (April 13th, 2010)* * New option :as added to form_for allows to change the object name. The old <% form_for :client, @post %> becomes <% form_for @post, :as => :client %> [spastorino] diff --git a/actionpack/test/controller/layout_test.rb b/actionpack/test/controller/layout_test.rb index 4d687c1ec6..e1c1128753 100644 --- a/actionpack/test/controller/layout_test.rb +++ b/actionpack/test/controller/layout_test.rb @@ -209,7 +209,7 @@ class LayoutStatusIsRenderedTest < ActionController::TestCase end end -unless RUBY_PLATFORM =~ /(:?mswin|mingw|bccwin)/ +unless RUBY_PLATFORM =~ /mswin|mingw/ class LayoutSymlinkedTest < LayoutTest layout "symlinked/symlinked_layout" end |