aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/CHANGELOG.md
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2011-12-06 11:28:05 -0200
committerSantiago Pastorino <santiago@wyeworks.com>2011-12-06 11:28:05 -0200
commit9be2353fac89729b839df3d0538b607f3fc1aa87 (patch)
treed65b24e36ac96cd4155a133af2ce270151bef072 /actionpack/CHANGELOG.md
parente58d663f3e285f22f2ca249cfc28d3b5673c5708 (diff)
downloadrails-9be2353fac89729b839df3d0538b607f3fc1aa87.tar.gz
rails-9be2353fac89729b839df3d0538b607f3fc1aa87.tar.bz2
rails-9be2353fac89729b839df3d0538b607f3fc1aa87.zip
Sync AP CHANGELOG with 3-1-stable
Diffstat (limited to 'actionpack/CHANGELOG.md')
-rw-r--r--actionpack/CHANGELOG.md8
1 files changed, 8 insertions, 0 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index ebb8277220..6d62d5eeec 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -96,6 +96,14 @@
persistent between requests so if you need to manipulate the environment
for your test you need to do it before the cookie jar is created.
+## Rails 3.1.4 (unreleased) ##
+
+* Allow to use asset_path on named_routes aliasing RailsHelper's
+ asset_path to path_to_asset *Adrian Pike*
+
+* Assets should use the request protocol by default or default to
+ relative if no request is available *Jonathan del Strother*
+
## Rails 3.1.3 (unreleased) ##
* Fix using `tranlate` helper with a html translation which uses the `:count` option for