Merge branch '2872-fixes-for-rails-6-upgrade' into qa

Iridescent-CM · Aug 11, 2021 · 2a5a445 · 2a5a445
2 parents 39c0bfd + 98cf704
commit 2a5a445
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/Gemfile b/Gemfile
@@ -131,7 +131,6 @@ end
 group :production do
   gem "hiredis", "~> 0.6"
   gem "rack-timeout", "~> 0.5"
-  gem "heroku-deflater", "~> 0.6"
   gem "rails_autoscale_agent"
   gem "cloudflare-rails", "~> 2.0"
   gem "wkhtmltopdf-heroku", "2.12.5.0"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -232,8 +232,6 @@ GEM
       activesupport (>= 5.0)
     hashdiff (1.0.1)
     hashery (2.1.2)
-    heroku-deflater (0.6.3)
-      rack (>= 1.4.5)
     highline (2.0.3)
     hirb (0.7.3)
     hiredis (0.6.3)
@@ -564,7 +562,6 @@ DEPENDENCIES
   friendly_id (~> 5.4)
   geocoder (~> 1.4.9)
   gibbon (~> 3.3.0)
-  heroku-deflater (~> 0.6)
   hiredis (~> 0.6)
   httparty (~> 0.16)
   i18n-tasks (~> 0.9)

diff --git a/config/application.rb b/config/application.rb
@@ -50,6 +50,8 @@ class Application < Rails::Application
       r301 '/users/sign_in', '/signin'
     end
 
+    config.middleware.use Rack::Deflater
+
     require "pdfkit"
     config.middleware.use PDFKit::Middleware,
       {header_right: '[page]/[toPage]'},