Merge pull request #535 from rails/rm-fix-deprecations

Fix deprecations
rails · Jul 31, 2024 · 550bce4 · 550bce4
2 parents aa0cf7c + 6245157
commit 550bce4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/lib/sprockets/railtie.rb b/lib/sprockets/railtie.rb
@@ -222,7 +222,7 @@ def self.build_manifest(app)
       if config.assets.compile
         app.assets = self.build_environment(app, true)
         app.routes.prepend do
-          mount app.assets => config.assets.prefix
+          mount app.assets, at: config.assets.prefix
         end
       end
 

diff --git a/test/test_quiet_assets.rb b/test/test_quiet_assets.rb
@@ -21,6 +21,7 @@ def setup
     @app = Class.new(Rails::Application)
     @app.config.eager_load = false
     @app.config.logger = ActiveSupport::Logger.new("/dev/null")
+    @app.config.active_support.to_time_preserves_timezone = :zone
 
     FileUtils.mkdir_p(ASSET_PATH)
     File.open(ASSET_PATH.join("manifest.js"), "w") { |f| f << "" }