aboutsummaryrefslogtreecommitdiffstats
path: root/railties/CHANGELOG
diff options
context:
space:
mode:
authorGonçalo Silva <goncalossilva@gmail.com>2011-03-28 04:20:49 +0100
committerGonçalo Silva <goncalossilva@gmail.com>2011-03-28 04:20:49 +0100
commit6f0caa1a534a065753d51430b649114bc8bf54ac (patch)
treeaf9657373436a38ef7828b26a804d1fe12e479ad /railties/CHANGELOG
parent726b7ede54031eecfcee34eec80040553e9ad19f (diff)
parent245542ea2994961731be105db6c076256a22a7a9 (diff)
downloadrails-6f0caa1a534a065753d51430b649114bc8bf54ac.tar.gz
rails-6f0caa1a534a065753d51430b649114bc8bf54ac.tar.bz2
rails-6f0caa1a534a065753d51430b649114bc8bf54ac.zip
Merge branch 'master' of https://github.com/rails/rails into performance_test
Diffstat (limited to 'railties/CHANGELOG')
-rw-r--r--railties/CHANGELOG2
1 files changed, 2 insertions, 0 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index 75f1df44e7..c1e0a214d2 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,5 +1,7 @@
*Rails 3.1.0 (unreleased)*
+* Added `config.force_ssl` configuration which loads Rack::SSL middleware and force all requests to be under HTTPS protocol [DHH, Prem Sichanugrist, and Josh Peek]
+
* Added `rails plugin new` command which generates rails plugin with gemspec, tests and dummy application for testing [Piotr Sarnacki]
* Added -j parameter with jquery/prototype as options. Now you can create your apps with jQuery using `rails new myapp -j jquery`. The default is still Prototype. [siong1987]