aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorSean Griffin <sean@seantheprogrammer.com>2016-02-01 14:27:38 -0700
committerSean Griffin <sean@seantheprogrammer.com>2016-02-01 14:37:52 -0700
commit49f6ce63f33b7817bcbd0cdf5f8881b63f40d9c9 (patch)
tree454e81ebf8d0697aabde55c265fdf15a8cf0437b /actionpack
parent633969f159c4f1ff23d98ec6e25cf84a78994824 (diff)
downloadrails-49f6ce63f33b7817bcbd0cdf5f8881b63f40d9c9.tar.gz
rails-49f6ce63f33b7817bcbd0cdf5f8881b63f40d9c9.tar.bz2
rails-49f6ce63f33b7817bcbd0cdf5f8881b63f40d9c9.zip
Preparing for Rails 5.0.0.beta2
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/CHANGELOG.md7
-rw-r--r--actionpack/lib/action_pack/gem_version.rb2
2 files changed, 7 insertions, 2 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index b2d9288eca..2aa78d20c0 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,3 +1,8 @@
+## Rails 5.0.0.beta2 (February 01, 2016) ##
+
+* No changes.
+
+
* Add `-g` and `-c` (short for _grep_ and _controller_ respectively) options
to `bin/rake routes`. These options return the url `name`, `verb` and
`path` field that match the pattern or match a specific controller.
@@ -7,7 +12,7 @@
See #18902.
*Anton Davydov* & *Vipul A M*
-
+
* Response etags to always be weak: Prefixes 'W/' to value returned by
`ActionDispatch::Http::Cache::Response#etag=`, such that etags set in
`fresh_when` and `stale?` are weak.
diff --git a/actionpack/lib/action_pack/gem_version.rb b/actionpack/lib/action_pack/gem_version.rb
index 3a1410d492..778c5482d3 100644
--- a/actionpack/lib/action_pack/gem_version.rb
+++ b/actionpack/lib/action_pack/gem_version.rb
@@ -8,7 +8,7 @@ module ActionPack
MAJOR = 5
MINOR = 0
TINY = 0
- PRE = "beta1.1"
+ PRE = "beta2"
STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
end