aboutsummaryrefslogtreecommitdiffstats
path: root/actionview
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-02-18 15:45:20 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-02-18 15:45:20 -0300
commit8b20c72dd80e2faf531f308d430a145a253aeac3 (patch)
tree55c5b8bb2d7f4afabf489286761d98051bd57a1c /actionview
parent6256b1de9a2d968b0d123ad6a09b33de01019ae6 (diff)
downloadrails-8b20c72dd80e2faf531f308d430a145a253aeac3.tar.gz
rails-8b20c72dd80e2faf531f308d430a145a253aeac3.tar.bz2
rails-8b20c72dd80e2faf531f308d430a145a253aeac3.zip
Preparing for 4.1.0.beta2 release
Diffstat (limited to 'actionview')
-rw-r--r--actionview/CHANGELOG.md4
-rw-r--r--actionview/lib/action_view/version.rb2
2 files changed, 5 insertions, 1 deletions
diff --git a/actionview/CHANGELOG.md b/actionview/CHANGELOG.md
index 0f38195514..c141a1fedd 100644
--- a/actionview/CHANGELOG.md
+++ b/actionview/CHANGELOG.md
@@ -1,3 +1,7 @@
+* Escape format, negative_format and units options of number helpers
+
+ Fixes: CVE-2014-0081
+
* A Cycle object should accept an array and cycle through it as it would with a set of
comma-separated objects.
diff --git a/actionview/lib/action_view/version.rb b/actionview/lib/action_view/version.rb
index edb6d8f116..3d5d6c9be1 100644
--- a/actionview/lib/action_view/version.rb
+++ b/actionview/lib/action_view/version.rb
@@ -1,7 +1,7 @@
module ActionView
# Returns the version of the currently loaded ActionView as a Gem::Version
def self.version
- Gem::Version.new "4.1.0.beta1"
+ Gem::Version.new "4.1.0.beta2"
end
module VERSION #:nodoc: