aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2019-01-18 15:42:12 -0500
committerRafael Mendonça França <rafaelmfranca@gmail.com>2019-01-18 15:42:12 -0500
commit5a0230c67f852fb21173f99647e76336897446c1 (patch)
tree229177305a322ef5edbd9b0526976ec8f0c76391 /actionpack
parentea83132e0eeb6988f9211d5b5cbe4b99f2b9982e (diff)
downloadrails-5a0230c67f852fb21173f99647e76336897446c1.tar.gz
rails-5a0230c67f852fb21173f99647e76336897446c1.tar.bz2
rails-5a0230c67f852fb21173f99647e76336897446c1.zip
Preparing for 6.0.0.beta1 release
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/CHANGELOG.md2
-rw-r--r--actionpack/lib/action_pack/gem_version.rb2
2 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 94cd719ce9..1a1b1034aa 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,3 +1,5 @@
+## Rails 6.0.0.beta1 (January 18, 2019) ##
+
* Remove deprecated `fragment_cache_key` helper in favor of `combined_fragment_cache_key`.
*Rafael Mendonça França*
diff --git a/actionpack/lib/action_pack/gem_version.rb b/actionpack/lib/action_pack/gem_version.rb
index 37969fcb57..c7cb3cb91e 100644
--- a/actionpack/lib/action_pack/gem_version.rb
+++ b/actionpack/lib/action_pack/gem_version.rb
@@ -10,7 +10,7 @@ module ActionPack
MAJOR = 6
MINOR = 0
TINY = 0
- PRE = "alpha"
+ PRE = "beta1"
STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
end