From 5725989343653bb52a0fe7563992d92b374a8f29 Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Sat, 31 Jul 2021 12:47:06 +0100
Subject: [PATCH] Fix deprecated syntax in old controller helper

This syntax for rendering a file isn't valid in Rails 6.x...
---
 lib/spree/core/controller_helpers/common.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/spree/core/controller_helpers/common.rb b/lib/spree/core/controller_helpers/common.rb
index 78625c0bd8..27684873b4 100644
--- a/lib/spree/core/controller_helpers/common.rb
+++ b/lib/spree/core/controller_helpers/common.rb
@@ -42,7 +42,7 @@ module Spree
             respond_to do |type|
               type.html {
                 render status: :not_found,
-                       file: "#{::Rails.root}/public/404",
+                       file: Rails.root.join("public/404.html"),
                        formats: [:html],
                        layout: nil
               }