Skip to content

Commit 550bce4

Browse files
authored
Merge pull request #535 from rails/rm-fix-deprecations
Fix deprecations
2 parents aa0cf7c + 6245157 commit 550bce4

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

lib/sprockets/railtie.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ def self.build_manifest(app)
222222
if config.assets.compile
223223
app.assets = self.build_environment(app, true)
224224
app.routes.prepend do
225-
mount app.assets => config.assets.prefix
225+
mount app.assets, at: config.assets.prefix
226226
end
227227
end
228228

test/test_quiet_assets.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ def setup
2121
@app = Class.new(Rails::Application)
2222
@app.config.eager_load = false
2323
@app.config.logger = ActiveSupport::Logger.new("/dev/null")
24+
@app.config.active_support.to_time_preserves_timezone = :zone
2425

2526
FileUtils.mkdir_p(ASSET_PATH)
2627
File.open(ASSET_PATH.join("manifest.js"), "w") { |f| f << "" }

0 commit comments

Comments
 (0)