From 8bcaeff6c890f7cd6921a270be05eba126e09ab6 Mon Sep 17 00:00:00 2001 From: Andy Brett Date: Thu, 14 Jan 2021 10:03:59 -0800 Subject: [PATCH] resolve merge conflict; add ssl helper to base controller --- app/controllers/base_controller.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/controllers/base_controller.rb b/app/controllers/base_controller.rb index 143370f3e9..8ea4718cb5 100644 --- a/app/controllers/base_controller.rb +++ b/app/controllers/base_controller.rb @@ -1,12 +1,14 @@ # frozen_string_literal: true require 'spree/core/controller_helpers/order' +require 'spree/core/controller_helpers/ssl' require 'open_food_network/tag_rule_applicator' class BaseController < ApplicationController layout 'darkswarm' include Spree::Core::ControllerHelpers::Order + include Spree::Core::ControllerHelpers::SSL include I18nHelper include OrderCyclesHelper