Merge branch 'main' into dependabot/bundler/cloudflare-rails-5.0.1

Gemfile.lock

@@ -39,7 +39,7 @@ PATH
       bcrypt (~> 3.1.16)
       bugsnag
       ckeditor
-      cloudflare-rails
+      cloudflare-rails (~> 4.1)
       devise
       devise-pwned_password
       email_address
@@ -377,7 +377,7 @@ GEM
     devise-pwned_password (0.1.10)
       devise (~> 4)
       pwned (~> 2.0.0)
-    diff-lcs (1.5.0)
+    diff-lcs (1.5.1)
     docile (1.4.0)
     dotenv (2.8.1)
     dotenv-rails (2.8.1)
@@ -617,20 +617,20 @@ GEM
       actionpack (>= 5.2)
       railties (>= 5.2)
     rexml (3.2.6)
-    rspec (3.12.0)
-      rspec-core (~> 3.12.0)
-      rspec-expectations (~> 3.12.0)
-      rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.2)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.3)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
+      rspec-support (~> 3.13.0)
     rspec-instafail (1.0.0)
       rspec
-    rspec-mocks (3.12.6)
+    rspec-mocks (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
+      rspec-support (~> 3.13.0)
     rspec-rails (6.1.1)
       actionpack (>= 6.1)
       activesupport (>= 6.1)
@@ -639,7 +639,7 @@ GEM
       rspec-expectations (~> 3.12)
       rspec-mocks (~> 3.12)
       rspec-support (~> 3.12)
-    rspec-support (3.12.1)
+    rspec-support (3.13.0)
     rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
     rspec_pacman_formatter (0.1.7)

plugins/ShinyCMS/shinycms.gemspec

@@ -123,7 +123,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'sentry-ruby'
 
   # Fix request.ip when running behind Cloudflare proxying
-  spec.add_dependency 'cloudflare-rails'
+  spec.add_dependency 'cloudflare-rails', '~> 4.1'
 
   # Used to export demo site data from the database
   spec.add_dependency 'seed_dump'