diff options
| author | Rajinder Yadav <devguy.ca@gmail.com> | 2010-10-15 22:19:39 -0400 |
|---|---|---|
| committer | Rajinder Yadav <devguy.ca@gmail.com> | 2010-10-15 22:19:39 -0400 |
| commit | 62eb00a62e3868c3500372def52968b919332b51 (patch) | |
| tree | 8497f517402c19eae1fea22943565cbf11496ef7 /railties/CHANGELOG | |
| parent | 018bf0f5756ef3887815ea46d6671dc1d3b526cf (diff) | |
| parent | cffae06a4f1b7aac86a7e99cfb244890f837f976 (diff) | |
| download | rails-62eb00a62e3868c3500372def52968b919332b51.tar.gz rails-62eb00a62e3868c3500372def52968b919332b51.tar.bz2 rails-62eb00a62e3868c3500372def52968b919332b51.zip | |
Merge branch 'master' of git://github.com/lifo/docrails
Diffstat (limited to 'railties/CHANGELOG')
| -rw-r--r-- | railties/CHANGELOG | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index d2a4add375..b38a9ce750 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,6 +1,8 @@ *Rails 3.1.0 (unreleased)* -* Added Rack::Cache to the default middleware stack +* Added Rack::Etag and Rack::ConditionalGet to the default middleware stack [José Valim] + +* Added Rack::Cache to the default middleware stack [Yehuda Katz and Carl Lerche] * Engine is now rack application [Piotr Sarnacki] |