Merge branch '6-1-sec' into 6-1-stable

* 6-1-sec: Preparing for 6.1.7.7 release update changelog Merge pull request #48869 from brunoprietog/disable-session-active-storage-proxy-controllers
rails · Feb 21, 2024 · 2fcc005 · 2fcc005
2 parents 517ff4b + ac87f58
commit 2fcc005
Show file tree

Hide file tree

Showing 35 changed files with 406 additions and 302 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
diff --git a/RAILS_VERSION b/RAILS_VERSION
@@ -1 +1 @@
-6.1.7.6
+6.1.7.7
diff --git a/actioncable/CHANGELOG.md b/actioncable/CHANGELOG.md
@@ -1,3 +1,8 @@
+## Rails 6.1.7.7 (February 21, 2024) ##
+
+*   No changes.
+
+
 ## Rails 6.1.7.6 (August 22, 2023) ##
 
 *   No changes.

diff --git a/actioncable/lib/action_cable/gem_version.rb b/actioncable/lib/action_cable/gem_version.rb
@@ -10,7 +10,7 @@ module VERSION
     MAJOR = 6
     MINOR = 1
     TINY  = 7
-    PRE   = "6"
+    PRE   = "7"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

diff --git a/actioncable/package.json b/actioncable/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rails/actioncable",
-  "version": "6.1.7-6",
+  "version": "6.1.7-7",
   "description": "WebSocket framework for Ruby on Rails.",
   "main": "app/assets/javascripts/action_cable.js",
   "files": [

diff --git a/actionmailbox/CHANGELOG.md b/actionmailbox/CHANGELOG.md
@@ -1,3 +1,8 @@
+## Rails 6.1.7.7 (February 21, 2024) ##
+
+*   No changes.
+
+
 ## Rails 6.1.7.6 (August 22, 2023) ##
 
 *   No changes.

diff --git a/actionmailbox/lib/action_mailbox/gem_version.rb b/actionmailbox/lib/action_mailbox/gem_version.rb
@@ -10,7 +10,7 @@ module VERSION
     MAJOR = 6
     MINOR = 1
     TINY  = 7
-    PRE   = "6"
+    PRE   = "7"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md
@@ -1,3 +1,8 @@
+## Rails 6.1.7.7 (February 21, 2024) ##
+
+*   No changes.
+
+
 ## Rails 6.1.7.6 (August 22, 2023) ##
 
 *   No changes.

diff --git a/actionmailer/lib/action_mailer/gem_version.rb b/actionmailer/lib/action_mailer/gem_version.rb
@@ -10,7 +10,7 @@ module VERSION
     MAJOR = 6
     MINOR = 1
     TINY  = 7
-    PRE   = "6"
+    PRE   = "7"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
@@ -2,6 +2,11 @@
 
     *Hartley McGuire*
 
+## Rails 6.1.7.7 (February 21, 2024) ##
+
+*   No changes.
+
+
 ## Rails 6.1.7.6 (August 22, 2023) ##
 
 *   No changes.

diff --git a/actionpack/lib/action_pack/gem_version.rb b/actionpack/lib/action_pack/gem_version.rb
@@ -10,7 +10,7 @@ module VERSION
     MAJOR = 6
     MINOR = 1
     TINY  = 7
-    PRE   = "6"
+    PRE   = "7"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

diff --git a/actiontext/CHANGELOG.md b/actiontext/CHANGELOG.md
@@ -1,3 +1,8 @@
+## Rails 6.1.7.7 (February 21, 2024) ##
+
+*   No changes.
+
+
 ## Rails 6.1.7.6 (August 22, 2023) ##
 
 *   No changes.

diff --git a/actiontext/lib/action_text/gem_version.rb b/actiontext/lib/action_text/gem_version.rb
@@ -10,7 +10,7 @@ module VERSION
     MAJOR = 6
     MINOR = 1
     TINY  = 7
-    PRE   = "6"
+    PRE   = "7"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

diff --git a/actiontext/package.json b/actiontext/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rails/actiontext",
-  "version": "6.1.7-6",
+  "version": "6.1.7-7",
   "description": "Edit and display rich text in Rails applications",
   "main": "app/javascript/actiontext/index.js",
   "files": [

diff --git a/actionview/CHANGELOG.md b/actionview/CHANGELOG.md
@@ -1,3 +1,8 @@
+## Rails 6.1.7.7 (February 21, 2024) ##
+
+*   No changes.
+
+
 ## Rails 6.1.7.6 (August 22, 2023) ##
 
 *   No changes.

diff --git a/actionview/lib/action_view/gem_version.rb b/actionview/lib/action_view/gem_version.rb
@@ -10,7 +10,7 @@ module VERSION
     MAJOR = 6
     MINOR = 1
     TINY  = 7
-    PRE   = "6"
+    PRE   = "7"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

diff --git a/actionview/package.json b/actionview/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rails/ujs",
-  "version": "6.1.7-6",
+  "version": "6.1.7-7",
   "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 6.1.7.7 (February 21, 2024) ##
+
+*   No changes.
+
+
 ## Rails 6.1.7.6 (August 22, 2023) ##
 
 *   No changes.

diff --git a/activejob/lib/active_job/gem_version.rb b/activejob/lib/active_job/gem_version.rb
@@ -10,7 +10,7 @@ module VERSION
     MAJOR = 6
     MINOR = 1
     TINY  = 7
-    PRE   = "6"
+    PRE   = "7"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

diff --git a/activemodel/CHANGELOG.md b/activemodel/CHANGELOG.md
@@ -1,3 +1,8 @@
+## Rails 6.1.7.7 (February 21, 2024) ##
+
+*   No changes.
+
+
 ## Rails 6.1.7.6 (August 22, 2023) ##
 
 *   No changes.

diff --git a/activemodel/lib/active_model/gem_version.rb b/activemodel/lib/active_model/gem_version.rb
@@ -10,7 +10,7 @@ module VERSION
     MAJOR = 6
     MINOR = 1
     TINY  = 7
-    PRE   = "6"
+    PRE   = "7"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
@@ -1,3 +1,8 @@
+## Rails 6.1.7.7 (February 21, 2024) ##
+
+*   No changes.
+
+
 ## Rails 6.1.7.6 (August 22, 2023) ##
 
 *   No changes.

diff --git a/activerecord/lib/active_record/gem_version.rb b/activerecord/lib/active_record/gem_version.rb
@@ -10,7 +10,7 @@ module VERSION
     MAJOR = 6
     MINOR = 1
     TINY  = 7
-    PRE   = "6"
+    PRE   = "7"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

diff --git a/activestorage/CHANGELOG.md b/activestorage/CHANGELOG.md
@@ -7,6 +7,16 @@
 
     *Haroon Ahmed*
 
+## Rails 6.1.7.7 (February 21, 2024) ##
+
+*   Disables the session in `ActiveStorage::Blobs::ProxyController`
+    and `ActiveStorage::Representations::ProxyController`
+    in order to allow caching by default in some CDNs as CloudFlare
+
+    Fixes #44136
+
+    *Bruno Prieto*
+
 ## Rails 6.1.7.6 (August 22, 2023) ##
 
 *   No changes.

diff --git a/activestorage/app/controllers/active_storage/blobs/proxy_controller.rb b/activestorage/app/controllers/active_storage/blobs/proxy_controller.rb
@@ -4,6 +4,7 @@
 class ActiveStorage::Blobs::ProxyController < ActiveStorage::BaseController
   include ActiveStorage::SetBlob
   include ActiveStorage::SetHeaders
+  include ActiveStorage::DisableSession
 
   def show
     http_cache_forever public: true do

diff --git a/activestorage/app/controllers/active_storage/representations/proxy_controller.rb b/activestorage/app/controllers/active_storage/representations/proxy_controller.rb
@@ -3,6 +3,7 @@
 # Proxy files through application. This avoids having a redirect and makes files easier to cache.
 class ActiveStorage::Representations::ProxyController < ActiveStorage::Representations::BaseController
   include ActiveStorage::SetHeaders
+  include ActiveStorage::DisableSession
 
   def show
     http_cache_forever public: true do

diff --git a/activestorage/app/controllers/concerns/active_storage/disable_session.rb b/activestorage/app/controllers/concerns/active_storage/disable_session.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+# This concern disables the session in order to allow caching by default in some CDNs as CloudFlare.
+module ActiveStorage::DisableSession
+  extend ActiveSupport::Concern
+
+  included do
+    before_action do
+      request.session_options[:skip] = true
+    end
+  end
+end
diff --git a/activestorage/lib/active_storage/gem_version.rb b/activestorage/lib/active_storage/gem_version.rb
@@ -10,7 +10,7 @@ module VERSION
     MAJOR = 6
     MINOR = 1
     TINY  = 7
-    PRE   = "6"
+    PRE   = "7"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

diff --git a/activestorage/package.json b/activestorage/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rails/activestorage",
-  "version": "6.1.7-6",
+  "version": "6.1.7-7",
   "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
@@ -10,6 +10,11 @@
 
     *Yasuo Honda*
 
+## Rails 6.1.7.7 (February 21, 2024) ##
+
+*   No changes.
+
+
 ## Rails 6.1.7.6 (August 22, 2023) ##
 
 *   No changes.

diff --git a/activesupport/lib/active_support/gem_version.rb b/activesupport/lib/active_support/gem_version.rb
@@ -10,7 +10,7 @@ module VERSION
     MAJOR = 6
     MINOR = 1
     TINY  = 7
-    PRE   = "6"
+    PRE   = "7"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

diff --git a/guides/CHANGELOG.md b/guides/CHANGELOG.md
@@ -1,3 +1,8 @@
+## Rails 6.1.7.7 (February 21, 2024) ##
+
+*   No changes.
+
+
 ## Rails 6.1.7.6 (August 22, 2023) ##
 
 *   No changes.

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
@@ -1,3 +1,8 @@
+## Rails 6.1.7.7 (February 21, 2024) ##
+
+*   No changes.
+
+
 ## Rails 6.1.7.6 (August 22, 2023) ##
 
 *   No changes.

diff --git a/railties/lib/rails/gem_version.rb b/railties/lib/rails/gem_version.rb
@@ -10,7 +10,7 @@ module VERSION
     MAJOR = 6
     MINOR = 1
     TINY  = 7
-    PRE   = "6"
+    PRE   = "7"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

diff --git a/version.rb b/version.rb
@@ -10,7 +10,7 @@ module VERSION
     MAJOR = 6
     MINOR = 1
     TINY  = 7
-    PRE   = "6"
+    PRE   = "7"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end