Merge branch 'houdiniproject:main' into markdownlint

.github/workflows/code-scanning.yml

@@ -12,7 +12,7 @@ concurrency:
 env:
 # this version used for running various tools
   tool_node_version: "14.x"
-  tool_ruby_version: "2.7.6"
+  tool_ruby_version: "2.7.7"
 jobs:
   npm-package-download: # this downloads and caches all of the packages. We need this run on main so PRs to main can reuse the cache
       name: Download and cache any npm packages
@@ -35,7 +35,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-20.04]
-        ruby: [2.7.6]
+        ruby: [2.7.7]
     steps:
       - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1

.github/workflows/dependabot-notice-ruby-update.yml

@@ -11,7 +11,7 @@ on:
   - pull_request_target
 env:
   os: ubuntu-20.04
-  ruby: '2.7.6'
+  ruby: '2.7.7'
 jobs:
   update-NOTICE-ruby:
     runs-on: ubuntu-20.04

.github/workflows/js.yml

@@ -1,7 +1,7 @@
 # License: LGPL-3.0-or-later
 name: Javascript build and test
 env: 
-  ruby: '2.7.6'
+  ruby: '2.7.7'
 on: 
   pull_request:
     paths-ignore:

.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:

.github/workflows/placeholders.yml

@@ -26,6 +26,6 @@ jobs:
       matrix:
         os: [ubuntu-20.04]
         node: [14.19.1]
-        ruby: [2.7.6]
+        ruby: [2.7.7]
     steps:
       - run: 'echo "Placeholder for main_build"'

.github/workflows/pr.yml

@@ -9,7 +9,7 @@ concurrency:
 env:
 # this version used for running various tools
   tool_node_version: "14.x"
-  tool_ruby_version: "2.7.6"
+  tool_ruby_version: "2.7.7"
 jobs:
   changes:
     name: "Check for file changes"
@@ -51,7 +51,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-20.04]
-        ruby: [2.7.6]
+        ruby: [2.7.7]
     steps:
       - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1

.github/workflows/ruby.yml

@@ -18,7 +18,7 @@ jobs:
       matrix:
         os: [ubuntu-20.04]
         node: [14.19.1]
-        ruby: [2.7.6]
+        ruby: [2.7.7]
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
@@ -37,7 +37,7 @@ jobs:
       matrix:
         os: [ubuntu-20.04]
         node: [14.19.1]
-        ruby: [2.7.6]
+        ruby: [2.7.7]
     steps:
       - uses: actions/checkout@v3
       - name: Setup PostgreSQL with PostgreSQL extensions and unprivileged user

.ruby-version

@@ -1 +1 @@
-2.7.6
+2.7.7

Gemfile

@@ -12,21 +12,18 @@ gem 'sassc-rails', '~> 2.1', '>= 2.1.2'
 gem 'sassc', '~> 2.0', '>= 2.0.1'
 gem 'stripe', '~> 1.58' # January 19, 2017 version of the Stripe API https://stripe.com/docs/api
 gem 'webpacker', '~> 5.4.4'
-gem 'good_job', '~> 3.15'
+gem 'good_job', '~> 3.16'
 
 # fix for https://www.ruby-lang.org/en/news/2021/11/15/date-parsing-method-regexp-dos-cve-2021-41817/
 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

@@ -195,7 +195,7 @@ GEM
       raabro (~> 1.4)
     globalid (1.1.0)
       activesupport (>= 5.0)
-    good_job (3.15.13)
+    good_job (3.16.4)
       activejob (>= 6.0.0)
       activerecord (>= 6.0.0)
       concurrent-ruby (>= 1.0.2)
@@ -227,7 +227,7 @@ GEM
     jbuilder (2.11.5)
       actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
-    js-routes (2.2.5)
+    js-routes (2.2.7)
       railties (>= 4)
     json (2.6.3)
     kaminari (1.2.2)
@@ -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)
@@ -266,8 +261,8 @@ GEM
     mime-types-data (3.2022.0105)
     mini_magick (4.11.0)
     mini_mime (1.1.2)
-    mini_portile2 (2.8.2)
-    minitest (5.18.1)
+    mini_portile2 (2.8.4)
+    minitest (5.19.0)
     money (6.16.0)
       i18n (>= 0.6.4, <= 2)
     msgpack (1.6.0)
@@ -284,7 +279,7 @@ GEM
       net-protocol
     netrc (0.11.0)
     nio4r (2.5.9)
-    nokogiri (1.15.2)
+    nokogiri (1.15.3)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     orm_adapter (0.5.0)
@@ -306,13 +301,9 @@ GEM
       nio4r (~> 2.0)
     raabro (1.4.0)
     racc (1.7.1)
-    rack (2.2.7)
-    rack-attack (5.4.2)
-      rack (>= 1.0, < 3)
+    rack (2.2.8)
     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 +353,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)
@@ -492,7 +481,7 @@ GEM
       activejob (>= 4.0.0)
       wisper
     wisper-rspec (1.1.0)
-    zeitwerk (2.6.8)
+    zeitwerk (2.6.10)
 
 PLATFORMS
   ruby
@@ -514,7 +503,7 @@ DEPENDENCIES
   factory_bot (~> 6.2)
   factory_bot_rails (~> 6.2)
   fast_blank
-  good_job (~> 3.15)
+  good_job (~> 3.16)
   hamster (~> 3.0)
   houdini_full_contact!
   http_accept_language
@@ -525,15 +514,12 @@ 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)