Preparing for 5.2.6 release

rails · May 5, 2021 · 4866154 · 4866154
1 parent 4d68f67
commit 4866154
Show file tree

Hide file tree

Showing 27 changed files with 120 additions and 55 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -26,63 +26,63 @@ GIT
 PATH
   remote: .
   specs:
-    actioncable (5.2.5)
-      actionpack (= 5.2.5)
+    actioncable (5.2.6)
+      actionpack (= 5.2.6)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.5)
-      actionpack (= 5.2.5)
-      actionview (= 5.2.5)
-      activejob (= 5.2.5)
+    actionmailer (5.2.6)
+      actionpack (= 5.2.6)
+      actionview (= 5.2.6)
+      activejob (= 5.2.6)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.5)
-      actionview (= 5.2.5)
-      activesupport (= 5.2.5)
+    actionpack (5.2.6)
+      actionview (= 5.2.6)
+      activesupport (= 5.2.6)
       rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.5)
-      activesupport (= 5.2.5)
+    actionview (5.2.6)
+      activesupport (= 5.2.6)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.2.5)
-      activesupport (= 5.2.5)
+    activejob (5.2.6)
+      activesupport (= 5.2.6)
       globalid (>= 0.3.6)
-    activemodel (5.2.5)
-      activesupport (= 5.2.5)
-    activerecord (5.2.5)
-      activemodel (= 5.2.5)
-      activesupport (= 5.2.5)
+    activemodel (5.2.6)
+      activesupport (= 5.2.6)
+    activerecord (5.2.6)
+      activemodel (= 5.2.6)
+      activesupport (= 5.2.6)
       arel (>= 9.0)
-    activestorage (5.2.5)
-      actionpack (= 5.2.5)
-      activerecord (= 5.2.5)
+    activestorage (5.2.6)
+      actionpack (= 5.2.6)
+      activerecord (= 5.2.6)
       marcel (~> 1.0.0)
-    activesupport (5.2.5)
+    activesupport (5.2.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    rails (5.2.5)
-      actioncable (= 5.2.5)
-      actionmailer (= 5.2.5)
-      actionpack (= 5.2.5)
-      actionview (= 5.2.5)
-      activejob (= 5.2.5)
-      activemodel (= 5.2.5)
-      activerecord (= 5.2.5)
-      activestorage (= 5.2.5)
-      activesupport (= 5.2.5)
+    rails (5.2.6)
+      actioncable (= 5.2.6)
+      actionmailer (= 5.2.6)
+      actionpack (= 5.2.6)
+      actionview (= 5.2.6)
+      activejob (= 5.2.6)
+      activemodel (= 5.2.6)
+      activerecord (= 5.2.6)
+      activestorage (= 5.2.6)
+      activesupport (= 5.2.6)
       bundler (>= 1.3.0)
-      railties (= 5.2.5)
+      railties (= 5.2.6)
       sprockets-rails (>= 2.0.0)
-    railties (5.2.5)
-      actionpack (= 5.2.5)
-      activesupport (= 5.2.5)
+    railties (5.2.6)
+      actionpack (= 5.2.6)
+      activesupport (= 5.2.6)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
@@ -284,6 +284,7 @@ GEM
     method_source (1.0.0)
     mini_magick (4.11.0)
     mini_mime (1.1.0)
+    mini_portile2 (2.5.1)
     minitest (5.14.4)
     minitest-bisect (1.5.1)
       minitest-server (~> 1.0)
@@ -300,6 +301,9 @@ GEM
       ruby2_keywords (~> 0.0.1)
     mysql2 (0.5.3)
     nio4r (2.5.7)
+    nokogiri (1.11.3)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
     nokogiri (1.11.3-x86_64-darwin)
       racc (~> 1.4)
     os (1.1.1)
@@ -457,6 +461,7 @@ GEM
       nokogiri (~> 1.8)
 
 PLATFORMS
+  ruby
   x86_64-darwin-19
 
 DEPENDENCIES

diff --git a/RAILS_VERSION b/RAILS_VERSION
@@ -1 +1 @@
-5.2.5
+5.2.6
diff --git a/actioncable/CHANGELOG.md b/actioncable/CHANGELOG.md
@@ -1,3 +1,8 @@
+## Rails 5.2.6 (May 05, 2021) ##
+
+*   No changes.
+
+
 ## Rails 5.2.5 (March 26, 2021) ##
 
 *   No changes.

diff --git a/actioncable/lib/action_cable/gem_version.rb b/actioncable/lib/action_cable/gem_version.rb
@@ -9,7 +9,7 @@ def self.gem_version
   module VERSION
     MAJOR = 5
     MINOR = 2
-    TINY  = 5
+    TINY  = 6
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")

diff --git a/actioncable/package.json b/actioncable/package.json
@@ -1,6 +1,6 @@
 {
   "name": "actioncable",
-  "version": "5.2.5",
+  "version": "5.2.6",
   "description": "WebSocket framework for Ruby on Rails.",
   "main": "lib/assets/compiled/action_cable.js",
   "files": [

diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md
@@ -1,3 +1,8 @@
+## Rails 5.2.6 (May 05, 2021) ##
+
+*   No changes.
+
+
 ## Rails 5.2.5 (March 26, 2021) ##
 
 *   No changes.

diff --git a/actionmailer/lib/action_mailer/gem_version.rb b/actionmailer/lib/action_mailer/gem_version.rb
@@ -9,7 +9,7 @@ def self.gem_version
   module VERSION
     MAJOR = 5
     MINOR = 2
-    TINY  = 5
+    TINY  = 6
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")

diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
@@ -1,21 +1,31 @@
+## Rails 5.2.6 (May 05, 2021) ##
+
 *   Accept base64_urlsafe CSRF tokens to make forward compatible.
 
     Base64 strict-encoded CSRF tokens are not inherently websafe, which makes
     them difficult to deal with. For example, the common practice of sending
     the CSRF token to a browser in a client-readable cookie does not work properly
     out of the box: the value has to be url-encoded and decoded to survive transport.
 
-    In Rails 6.1, we generate Base64 urlsafe-encoded CSRF tokens, which are inherently
+    In this version, we generate Base64 urlsafe-encoded CSRF tokens, which are inherently
     safe to transport. Validation accepts both urlsafe tokens, and strict-encoded
     tokens for backwards compatibility.
 
-    In Rails 5.2.5, the CSRF token format is accidentally changed to urlsafe-encoded.
-    If you upgrade apps from 5.2.5, set the config `urlsafe_csrf_tokens = true`.
+    How the tokes are encoded is controllr by the `action_controller.urlsafe_csrf_tokens`
+    config.
+
+    In Rails 5.2.5, the CSRF token format was accidentally changed to urlsafe-encoded.
+
+    **Atention**: If you already upgraded your application to 5.2.5, set the config
+    `urlsafe_csrf_tokens` to `true`, otherwise your form submission will start to fail
+    during the deploy of this new version.
 
     ```ruby
     Rails.application.config.action_controller.urlsafe_csrf_tokens = true
     ```
 
+    If you are upgrading from 5.2.4.x, you don't need to change this configuration.
+
     *Scott Blum*, *Étienne Barrié*
 
 
@@ -67,7 +77,7 @@
 
     The `ActionDispatch::Session::MemcacheStore` is still vulnerable given it requires the
     gem dalli to be updated as well.
-    
+
     _Breaking changes:_
     *   `session.id` now returns an instance of `Rack::Session::SessionId` and not a String (use `session.id.public_id` to restore the old behaviour, see #38063)
     *   Accessing the session id using `session[:session_id]`/`session['session_id']` no longer works with

diff --git a/actionpack/lib/action_pack/gem_version.rb b/actionpack/lib/action_pack/gem_version.rb
@@ -9,7 +9,7 @@ def self.gem_version
   module VERSION
     MAJOR = 5
     MINOR = 2
-    TINY  = 5
+    TINY  = 6
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")

diff --git a/actionview/CHANGELOG.md b/actionview/CHANGELOG.md
@@ -1,3 +1,8 @@
+## Rails 5.2.6 (May 05, 2021) ##
+
+*   No changes.
+
+
 ## Rails 5.2.5 (March 26, 2021) ##
 
 *   No changes.

diff --git a/actionview/lib/action_view/gem_version.rb b/actionview/lib/action_view/gem_version.rb
@@ -9,7 +9,7 @@ def self.gem_version
   module VERSION
     MAJOR = 5
     MINOR = 2
-    TINY  = 5
+    TINY  = 6
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")

diff --git a/actionview/package.json b/actionview/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rails-ujs",
-  "version": "5.2.5",
+  "version": "5.2.6",
   "description": "Ruby on Rails unobtrusive scripting adapter",
   "main": "lib/assets/compiled/rails-ujs.js",
   "files": [

diff --git a/activejob/CHANGELOG.md b/activejob/CHANGELOG.md
@@ -1,3 +1,8 @@
+## Rails 5.2.6 (May 05, 2021) ##
+
+*   No changes.
+
+
 ## Rails 5.2.5 (March 26, 2021) ##
 
 *   No changes.

diff --git a/activejob/lib/active_job/gem_version.rb b/activejob/lib/active_job/gem_version.rb
@@ -9,7 +9,7 @@ def self.gem_version
   module VERSION
     MAJOR = 5
     MINOR = 2
-    TINY  = 5
+    TINY  = 6
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")

diff --git a/activemodel/CHANGELOG.md b/activemodel/CHANGELOG.md
@@ -1,3 +1,8 @@
+## Rails 5.2.6 (May 05, 2021) ##
+
+*   No changes.
+
+
 ## Rails 5.2.5 (March 26, 2021) ##
 
 *   No changes.

diff --git a/activemodel/lib/active_model/gem_version.rb b/activemodel/lib/active_model/gem_version.rb
@@ -9,7 +9,7 @@ def self.gem_version
   module VERSION
     MAJOR = 5
     MINOR = 2
-    TINY  = 5
+    TINY  = 6
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")

diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
@@ -1,3 +1,8 @@
+## Rails 5.2.6 (May 05, 2021) ##
+
+*   No changes.
+
+
 ## Rails 5.2.5 (March 26, 2021) ##
 
 *   No changes.

diff --git a/activerecord/lib/active_record/gem_version.rb b/activerecord/lib/active_record/gem_version.rb
@@ -9,7 +9,7 @@ def self.gem_version
   module VERSION
     MAJOR = 5
     MINOR = 2
-    TINY  = 5
+    TINY  = 6
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")

diff --git a/activestorage/CHANGELOG.md b/activestorage/CHANGELOG.md
@@ -1,3 +1,8 @@
+## Rails 5.2.6 (May 05, 2021) ##
+
+*   No changes.
+
+
 ## Rails 5.2.5 (March 26, 2021) ##
 
 *   Marcel is upgraded to version 1.0.0 to avoid a dependency on GPL-licensed

diff --git a/activestorage/lib/active_storage/gem_version.rb b/activestorage/lib/active_storage/gem_version.rb
@@ -9,7 +9,7 @@ def self.gem_version
   module VERSION
     MAJOR = 5
     MINOR = 2
-    TINY  = 5
+    TINY  = 6
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")

diff --git a/activestorage/package.json b/activestorage/package.json
@@ -1,6 +1,6 @@
 {
   "name": "activestorage",
-  "version": "5.2.5",
+  "version": "5.2.6",
   "description": "Attach cloud and local files in Rails applications",
   "main": "app/assets/javascripts/activestorage.js",
   "files": [

diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
@@ -1,3 +1,8 @@
+## Rails 5.2.6 (May 05, 2021) ##
+
+*   No changes.
+
+
 ## Rails 5.2.5 (March 26, 2021) ##
 
 *   No changes.

diff --git a/activesupport/lib/active_support/gem_version.rb b/activesupport/lib/active_support/gem_version.rb
@@ -9,7 +9,7 @@ def self.gem_version
   module VERSION
     MAJOR = 5
     MINOR = 2
-    TINY  = 5
+    TINY  = 6
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")

diff --git a/guides/CHANGELOG.md b/guides/CHANGELOG.md
@@ -1,3 +1,8 @@
+## Rails 5.2.6 (May 05, 2021) ##
+
+*   No changes.
+
+
 ## Rails 5.2.5 (March 26, 2021) ##
 
 *   No changes.

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
@@ -1,3 +1,8 @@
+## Rails 5.2.6 (May 05, 2021) ##
+
+*   No changes.
+
+
 ## Rails 5.2.5 (March 26, 2021) ##
 
 *   No changes.

diff --git a/railties/lib/rails/gem_version.rb b/railties/lib/rails/gem_version.rb
@@ -9,7 +9,7 @@ def self.gem_version
   module VERSION
     MAJOR = 5
     MINOR = 2
-    TINY  = 5
+    TINY  = 6
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")

diff --git a/version.rb b/version.rb
@@ -9,7 +9,7 @@ def self.gem_version
   module VERSION
     MAJOR = 5
     MINOR = 2
-    TINY  = 5
+    TINY  = 6
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")