aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2017-11-27 13:01:15 -0500
committerRafael Mendonça França <rafaelmfranca@gmail.com>2017-11-27 14:50:03 -0500
commitcceeeb6e57f1cf8b24d507e2da9ed85d374c8bc5 (patch)
tree6c3b79fd535709776b6ad55755aa6ae7b1c4342a /actionpack
parent5fb36d03dba0eb5309788b53372ebe7dd980639d (diff)
downloadrails-cceeeb6e57f1cf8b24d507e2da9ed85d374c8bc5.tar.gz
rails-cceeeb6e57f1cf8b24d507e2da9ed85d374c8bc5.tar.bz2
rails-cceeeb6e57f1cf8b24d507e2da9ed85d374c8bc5.zip
Preparing for 5.2.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 1843f058e0..968d4bb0f8 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,3 +1,5 @@
+## Rails 5.2.0.beta1 (November 27, 2017) ##
+
* Add DSL for configuring Content-Security-Policy header
The DSL allows you to configure a global Content-Security-Policy
diff --git a/actionpack/lib/action_pack/gem_version.rb b/actionpack/lib/action_pack/gem_version.rb
index 28bc153f4d..cfced715fd 100644
--- a/actionpack/lib/action_pack/gem_version.rb
+++ b/actionpack/lib/action_pack/gem_version.rb
@@ -10,7 +10,7 @@ module ActionPack
MAJOR = 5
MINOR = 2
TINY = 0
- PRE = "alpha"
+ PRE = "beta1"
STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
end