aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/CHANGELOG.md
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2012-05-31 09:43:55 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-05-31 09:43:55 -0700
commitda048de773cea8a970768f04cecd0b3dbb015772 (patch)
tree013621b9f50005f40402acc0080d8139f167e48b /actionpack/CHANGELOG.md
parent67b94799c27cc3214017627aede759c5c5a39189 (diff)
parent4791822368bf0b1238a096c353cd408c6f1fe8c4 (diff)
downloadrails-da048de773cea8a970768f04cecd0b3dbb015772.tar.gz
rails-da048de773cea8a970768f04cecd0b3dbb015772.tar.bz2
rails-da048de773cea8a970768f04cecd0b3dbb015772.zip
Merge pull request #6571 from jeremyf/extract-force-ssl-filter-logic-to-separate-method
Extracted redirect logic from ActionController::Force::ClassMethods.forc...
Diffstat (limited to 'actionpack/CHANGELOG.md')
-rw-r--r--actionpack/CHANGELOG.md4
1 files changed, 4 insertions, 0 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index b907eea3c1..b4d50b7072 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,5 +1,9 @@
## Rails 4.0.0 (unreleased) ##
+* Extracted redirect logic from `ActionController::ForceSSL::ClassMethods.force_ssl` into `ActionController::ForceSSL#force_ssl_redirect`
+
+ *Jeremy Friesen*
+
* Make possible to use a block in button_to helper if button text is hard
to fit into the name parameter, e.g.: