aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/CHANGELOG.md
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/CHANGELOG.md')
-rw-r--r--actionpack/CHANGELOG.md30
1 files changed, 18 insertions, 12 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 516fcbe62f..1445cf43f6 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,17 +1,22 @@
## Rails 4.0.0 (unreleased) ##
+* Fix select_tag when option_tags is nil.
+ Fixes #7404.
+
+ *Sandeep Ravichandran*
+
* Add Request#formats=(extensions) that lets you set multiple formats directly in a prioritized order *DHH*
Example of using this for custom iphone views with an HTML fallback:
- class ApplicationController < ActionController::Base
- before_filter :adjust_format_for_iphone_with_html_fallback
-
- private
- def adjust_format_for_iphone_with_html_fallback
- request.formats = [ :iphone, :html ] if request.env["HTTP_USER_AGENT"][/iPhone/]
- end
- end
+ class ApplicationController < ActionController::Base
+ before_filter :adjust_format_for_iphone_with_html_fallback
+
+ private
+ def adjust_format_for_iphone_with_html_fallback
+ request.formats = [ :iphone, :html ] if request.env["HTTP_USER_AGENT"][/iPhone/]
+ end
+ end
* Add Routing Concerns to declare common routes that can be reused inside
@@ -51,8 +56,9 @@
*Richard Schneeman*
-* Add 'X-Frame-Options' => 'SAMEORIGIN' and
- 'X-XSS-Protection' => '1; mode=block'
+* Add 'X-Frame-Options' => 'SAMEORIGIN'
+ 'X-XSS-Protection' => '1; mode=block' and
+ 'X-Content-Type-Options' => 'nosniff'
as default headers.
*Egor Homakov*
@@ -1000,11 +1006,11 @@
Before:
- translate('foo_html', :something => '<script>') # => "...<script>..."
+ translate('foo_html', :something => '<script>') # => "...<script>..."
After:
- translate('foo_html', :something => '<script>') # => "...&lt;script&gt;..."
+ translate('foo_html', :something => '<script>') # => "...&lt;script&gt;..."
*Sergey Nartimov*