Merge branch 'main' into support-rails-7-2

.rubocop.yml

@@ -225,9 +225,6 @@ Rails/Output:
 Style/BarePercentLiterals:
   EnforcedStyle: percent_q
 
-Style/ClassAndModuleChildren:
-  Enabled: false
-
 Style/DoubleNegation:
   Enabled: false
 

variants/backend-base/app/controllers/active_storage/base_controller.rb

@@ -4,23 +4,25 @@
 # Copied from
 # https://github.com/rails/rails/blob/main/activestorage/app/controllers/active_storage/base_controller.rb
 # :nocov:
-class ActiveStorage::BaseController < ActionController::Base # rubocop:disable Rails/ApplicationController
-  include ActiveStorage::SetCurrent
+module ActiveStorage
+  class BaseController < ActionController::Base # rubocop:disable Rails/ApplicationController
+    include ActiveStorage::SetCurrent
 
-  protect_from_forgery with: :exception
+    protect_from_forgery with: :exception
 
-  before_action :authenticated?
+    before_action :authenticated?
 
-  self.etag_with_template_digest = false
+    self.etag_with_template_digest = false
 
-  private
+    private
 
-  # ActiveStorage defaults to security via obscurity approach to serving links
-  # If this is acceptable for your use case then this authenticable test can be
-  # removed. If not then code should be added to only serve files appropriately.
-  # https://edgeguides.rubyonrails.org/active_storage_overview.html#proxy-mode
-  def authenticated?
-    raise StandardError, "No authentication is configured for ActiveStorage"
+    # ActiveStorage defaults to security via obscurity approach to serving links
+    # If this is acceptable for your use case then this authenticable test can be
+    # removed. If not then code should be added to only serve files appropriately.
+    # https://edgeguides.rubyonrails.org/active_storage_overview.html#proxy-mode
+    def authenticated?
+      raise StandardError, "No authentication is configured for ActiveStorage"
+    end
   end
 end
 # :nocov:

variants/backend-base/rubocop.yml.tt

@@ -252,9 +252,6 @@ Rails/Output:
 Style/BarePercentLiterals:
   EnforcedStyle: percent_q
 
-Style/ClassAndModuleChildren:
-  Enabled: false
-
 Style/DoubleNegation:
   Enabled: false