Merge pull request #2657 from geeksforsocialchange/main

v0.23.4

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,53 @@
+<!--- Provide a general summary of your changes in the Title above -->
+<!--Read comments, before committing pull request read checklist again
+
+# Checklist:
+
+- [ ] I have performed a self-review of my own code,
+- [ ] I have commented my code, particularly in hard-to-understand areas,
+- [ ] I have made corresponding changes to the documentation,
+- [ ] I have added tests that prove my fix is effective or that my feature works,
+- [ ] Title include "WIP" if work is in progress.
+-->
+
+Resolves # <!--fill issue number-->
+
+## Description
+
+<!--- Describe your changes in detail -->
+
+### Motivation and Context
+
+<!--- Why is this change required? What problem does it solve? -->
+<!--- If it fixes an open issue, please link to the issue here. -->
+
+<!--- If there's a Figma file or similar spec, please link to to the issue. List any dependencies that are required for this change. (gems, js libraries, etc.)
+
+Include anything else we should know about.-->
+
+### Type of change
+
+<!-- Please delete options that are not relevant. -->
+
+- [ ] Bug fix (non-breaking change which fixes an issue)
+- [ ] New feature (non-breaking change which adds functionality)
+- [ ] Breaking change (fix or feature that would cause existing functionality to change)
+- [ ] This change requires a change to the deployment process
+- [ ] This change requires a documentation update
+- [ ] Documentation update
+
+### How Has This Been Tested?
+
+<!--- Please describe in detail how you tested your changes so that a reviewer can reproduce the results. -->
+<!--- Include details of your testing environment, and the tests you've run your self -->
+<!--- see how your change affects other areas of the code, etc. -->
+
+### How Will This Be Deployed?
+
+<!--- Run through any change to infrastructure, CLI commands or manual admin config to do -->
+<!--- For example, any env variables to add to the hosting infra? -->
+
+### Screenshots
+
+<!--Optional. Delete if not relevant.
+Include screenshots (before / after) for style changes, highlight edited element.-->

.github/workflows/test-and-deploy.yml

@@ -61,7 +61,7 @@ jobs:
 
       - if: github.ref == 'refs/heads/main'
         name: Deploy to placecal-staging.org
-        uses: dokku/github-action@0c02c44f990eac0ed2b3ee90a9b3ca0a38d15349 # v1.5.0
+        uses: dokku/github-action@036bf9c07f1b40707a16201bc7a349074c3ec554 # v1.6.1
         with:
           branch: main
           ci_branch_name: main
@@ -70,7 +70,7 @@ jobs:
 
       - if: github.ref == 'refs/heads/production'
         name: Deploy to placecal.org
-        uses: dokku/github-action@0c02c44f990eac0ed2b3ee90a9b3ca0a38d15349 # v1.5.0
+        uses: dokku/github-action@036bf9c07f1b40707a16201bc7a349074c3ec554 # v1.6.1
         with:
           branch: main
           ci_branch_name: production

.node-version

@@ -1 +1 @@
-20.16.0
+20.18.1

.rubocop.yml

@@ -131,4 +131,4 @@ Lint/SelfAssignment:
   Enabled: false
 Lint/RedundantCopDisableDirective:
   Enabled: false
-
+  

.ruby-version

@@ -1 +1 @@
-3.3.4
+3.3.6

Gemfile

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-ruby '3.3.4'
+ruby '3.3.6'
 source 'https://rubygems.org'
 
 git_source(:github) do |repo_name|
@@ -86,7 +86,6 @@ gem 'net-pop', require: false
 gem 'net-smtp', require: false
 gem 'observer'
 gem 'paper_trail'
-gem 'rollbar'
 gem 'uk_postcode'
 
 group :development, :test do
@@ -104,11 +103,11 @@ group :development do
   gem 'letter_opener'
   gem 'rails-erd'
   gem 'rdoc'
-  gem 'rubocop', '1.62.0', require: false
+  gem 'rubocop', '1.69.1', require: false
   gem 'rubocop-graphql', '1.5.4', require: false
   gem 'rubocop-minitest', '0.35.1', require: false
-  gem 'rubocop-performance', '1.21.1', require: false
-  gem 'rubocop-rails', '2.24.1', require: false
+  gem 'rubocop-performance', '1.23.0', require: false
+  gem 'rubocop-rails', '2.27.0', require: false
   gem 'rubocop-rake', require: false
   gem 'spring'
   # gem 'spring-watcher-listen'

Gemfile.lock

@@ -135,7 +135,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    concurrent-ruby (1.2.3)
+    concurrent-ruby (1.3.4)
     connection_pool (2.4.1)
     crack (0.4.5)
       rexml
@@ -179,7 +179,8 @@ GEM
     factory_bot_rails (6.2.0)
       factory_bot (~> 6.2.0)
       railties (>= 5.0.0)
-    ffi (1.15.5)
+    ffi (1.17.0)
+    ffi (1.17.0-x86_64-linux-gnu)
     font-awesome-rails (4.7.0.8)
       railties (>= 3.2, < 8.0)
     foreman (0.87.2)
@@ -219,16 +220,16 @@ GEM
     invisible_captcha (2.2.0)
       rails (>= 5.2)
     io-console (0.7.2)
-    irb (1.11.2)
-      rdoc
+    irb (1.14.1)
+      rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     jquery-rails (4.5.0)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     jsbundling-rails (1.0.2)
       railties (>= 6.0.0)
-    json (2.7.2)
+    json (2.8.2)
     json-canonicalization (0.3.0)
     json-ld (3.2.3)
       htmlentities (~> 4.3)
@@ -253,8 +254,11 @@ GEM
     loofah (2.22.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
-    mail (2.7.1)
+    mail (2.8.1)
       mini_mime (>= 0.1.1)
+      net-imap
+      net-pop
+      net-smtp
     marcel (1.0.4)
     matrix (0.4.2)
     method_source (1.0.0)
@@ -265,9 +269,9 @@ GEM
     mini_mime (1.1.5)
     mini_portile2 (2.8.7)
     minitest (5.22.3)
-    minitest-rails (7.1.0)
+    minitest-rails (7.1.1)
       minitest (~> 5.20)
-      railties (~> 7.1.0)
+      railties (>= 7.1.0, < 8.0.0)
     minitest-rails-capybara (0.0.2)
       capybara
       minitest-rails
@@ -303,20 +307,20 @@ GEM
     paper_trail (15.1.0)
       activerecord (>= 6.1)
       request_store (~> 1.4)
-    parallel (1.24.0)
-    parser (3.3.4.1)
+    parallel (1.26.3)
+    parser (3.3.6.0)
       ast (~> 2.4.1)
       racc
     pg (1.4.3)
     popper_js (1.16.1)
     psych (4.0.6)
       stringio
     public_suffix (4.0.7)
-    puma (5.6.8)
+    puma (5.6.9)
       nio4r (~> 2.0)
     pundit (2.2.0)
       activesupport (>= 3.0.0)
-    racc (1.7.3)
+    racc (1.8.1)
     rack (2.2.9)
     rack-cors (1.1.1)
       rack (>= 2.0.0)
@@ -371,7 +375,7 @@ GEM
       link_header (~> 0.0, >= 0.0.8)
     rdoc (6.4.1.1)
       psych (>= 4.0.0)
-    regexp_parser (2.9.2)
+    regexp_parser (2.9.3)
     reline (0.4.3)
       io-console (~> 0.5)
     request_store (1.5.1)
@@ -384,34 +388,31 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    rexml (3.2.9)
-      strscan
-    rollbar (3.5.2)
-    rubocop (1.62.0)
+    rexml (3.3.7)
+    rubocop (1.69.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.36.2, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.31.3)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.36.2)
       parser (>= 3.3.1.0)
     rubocop-graphql (1.5.4)
       rubocop (>= 1.50, < 2)
     rubocop-minitest (0.35.1)
       rubocop (>= 1.61, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-performance (1.21.1)
+    rubocop-performance (1.23.0)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rails (2.24.1)
+    rubocop-rails (2.27.0)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
-      rubocop (>= 1.33.0, < 2.0)
+      rubocop (>= 1.52.0, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
@@ -452,7 +453,6 @@ GEM
     stimulus-rails (1.0.4)
       railties (>= 6.0.0)
     stringio (3.0.9)
-    strscan (3.1.0)
     thor (1.3.1)
     tilt (2.0.11)
     timecop (0.9.5)
@@ -467,7 +467,7 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.8.2)
-    unicode-display_width (2.5.0)
+    unicode-display_width (2.6.0)
     vcr (6.1.0)
     view_component (3.9.0)
       activesupport (>= 5.2.0, < 8.0)
@@ -558,12 +558,11 @@ DEPENDENCIES
   rails-controller-testing
   rails-erd
   rdoc
-  rollbar
-  rubocop (= 1.62.0)
+  rubocop (= 1.69.1)
   rubocop-graphql (= 1.5.4)
   rubocop-minitest (= 0.35.1)
-  rubocop-performance (= 1.21.1)
-  rubocop-rails (= 2.24.1)
+  rubocop-performance (= 1.23.0)
+  rubocop-rails (= 2.27.0)
   rubocop-rake
   sass-rails (= 6.0.0)
   select2-rails
@@ -581,7 +580,7 @@ DEPENDENCIES
   yard
 
 RUBY VERSION
-   ruby 3.3.4p94
+   ruby 3.3.6p108
 
 BUNDLED WITH
    2.5.4