aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/CHANGELOG.md
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2012-12-18 16:29:00 +0100
committerDavid Heinemeier Hansson <david@loudthinking.com>2012-12-18 16:29:00 +0100
commit09aeee7247682178868241d446051696570e6e12 (patch)
tree51f4af1494145068345806ab21d2c38578bf6947 /actionpack/CHANGELOG.md
parentf6bbc3f582bfc16da3acc152c702b04102fcab81 (diff)
parentf6d0eda918756bf56e2c05afcaaabda723487017 (diff)
downloadrails-09aeee7247682178868241d446051696570e6e12.tar.gz
rails-09aeee7247682178868241d446051696570e6e12.tar.bz2
rails-09aeee7247682178868241d446051696570e6e12.zip
Merge
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 c3df2ebc0c..d213ab057c 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,5 +1,9 @@
## Rails 4.0.0 (unreleased) ##
+* Handle `:protocol` option in `stylesheet_link_tag` and `javascript_include_tag`
+
+ *Vasiliy Ermolovich*
+
* Clear url helper methods when routes are reloaded. *Andrew White*
* Fix a bug in `ActionDispatch::Request#raw_post` that caused `env['rack.input']`