Merge branch 'main' into update-to-ruby-2.7.7

.github/workflows/labeler.yml

@@ -6,7 +6,7 @@
 # https://github.com/actions/labeler/blob/master/README.md
 
 name: Labeler
-on: [pull_request]
+on: [pull_request_target]
 
 jobs:
   label:

Gemfile

@@ -19,14 +19,12 @@ gem "date", "~> 3.3.3"
 
 gem 'httparty', '~> 0.21.0' # https://github.com/jnunemaker/httparty
 gem 'rack-attack', '~> 5.2' # for blocking ip addressses
-gem 'rack-ssl', '~> 1.4'
 gem 'sprockets', '~> 3.7'
 
 # Helpers
 gem 'chronic', '~> 0.10.2' # For nat lang parsing of dates
 gem 'countries', '~> 4.2'
 gem 'i18n-js', '~> 3.8', git: 'https://github.com/houdiniproject/i18n-js.git', branch: 'houdini-tweaks'
-gem 'lograge', '~> 0.12.0' # make logging less terrible in rails
 gem 'rails-i18n', '~> 6.0.0', '~> 6'
 gem 'premailer-rails', '~> 1.12' # for styling of email
 gem 'money', '~> 6.16'

Gemfile.lock

@@ -245,11 +245,6 @@ GEM
     listen (3.8.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    lograge (0.12.0)
-      actionpack (>= 4)
-      activesupport (>= 4)
-      railties (>= 4)
-      request_store (~> 1.0)
     loofah (2.21.3)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
@@ -311,8 +306,6 @@ GEM
       rack (>= 1.0, < 3)
     rack-proxy (0.7.6)
       rack
-    rack-ssl (1.4.1)
-      rack
     rack-test (2.1.0)
       rack (>= 1.3)
     rack-timeout (0.6.3)
@@ -362,8 +355,6 @@ GEM
     regexp_parser (2.7.0)
     reline (0.3.3)
       io-console (~> 0.5)
-    request_store (1.5.1)
-      rack (>= 1.4)
     responders (3.1.0)
       actionpack (>= 5.2)
       railties (>= 5.2)
@@ -525,15 +516,13 @@ DEPENDENCIES
   js-routes
   kaminari
   listen
-  lograge (~> 0.12.0)
   money (~> 6.16)
   param_validation!
   pg (~> 1.4)
   premailer-rails (~> 1.12)
   puma (~> 5.6)
   qx!
   rack-attack (~> 5.2)
-  rack-ssl (~> 1.4)
   rack-timeout (~> 0.6.3)
   rails (= 6.1.7.4)
   rails-i18n (~> 6.0.0, ~> 6)