Merge branch 'main' into joss

openjournals · Mar 11, 2025 · 7926fee · 7926fee
2 parents 847a5ed + 5368a22
commit 7926fee
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 48 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -7,7 +7,7 @@ jobs:
     continue-on-error: ${{ matrix.failure-allowed }}
     strategy:
       matrix:
-        ruby-version: ['3.0.7', '3.1.6', '3.2.5', '3.3.4']
+        ruby-version: ['3.1.6', '3.2.6', '3.3.6', '3.4.1']
         failure-allowed: [false]
         include:
         - ruby-version: 'truffleruby'

diff --git a/Gemfile b/Gemfile
@@ -5,8 +5,8 @@ if ENV["CUSTOM_RUBY_VERSION"]
 end
 
 gem 'octokit'
-gem 'sinatra', '4.0.0'
-gem 'sinatra-contrib', '4.0.0'
+gem 'sinatra', '4.1.1'
+gem 'sinatra-contrib', '4.1.1'
 gem 'openssl'
 gem 'puma'
 gem 'sidekiq'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -7,93 +7,95 @@ GEM
     bibtex-ruby (6.1.0)
       latex-decode (~> 0.0)
       racc (~> 1.7)
-    bigdecimal (3.1.8)
-    cgi (0.4.1)
+    bigdecimal (3.1.9)
+    cgi (0.4.2)
     charlock_holmes (0.7.9)
     chronic (0.10.2)
-    connection_pool (2.4.1)
+    connection_pool (2.5.0)
     crack (1.0.0)
       bigdecimal
       rexml
-    diff-lcs (1.5.1)
-    dotenv (3.1.4)
-    faraday (2.12.0)
-      faraday-net_http (>= 2.0, < 3.4)
+    diff-lcs (1.6.0)
+    dotenv (3.1.7)
+    faraday (2.12.2)
+      faraday-net_http (>= 2.0, < 3.5)
       json
       logger
     faraday-follow_redirects (0.1.0)
       faraday (>= 2, < 3)
-    faraday-net_http (3.3.0)
-      net-http
+    faraday-net_http (3.4.0)
+      net-http (>= 0.5.0)
     faraday-retry (2.2.1)
       faraday (~> 2.0)
-    github-linguist (8.0.1)
+    github-linguist (9.0.0)
       cgi
       charlock_holmes (~> 0.7.7)
       mini_mime (~> 1.0)
       rugged (~> 1.0)
-    hashdiff (1.1.1)
+    hashdiff (1.1.2)
     issue (1.0.2)
       openssl (~> 3.2)
       rack (~> 3.1)
-    json (2.7.6)
+    json (2.10.1)
     latex-decode (0.4.0)
-    licensee (9.17.1)
+    licensee (9.18.0)
       dotenv (>= 2, < 4)
       octokit (>= 4.20, < 10.0)
-      reverse_markdown (>= 1, < 3)
+      reverse_markdown (>= 1, < 4)
       rugged (>= 0.24, < 2.0)
       thor (>= 0.19, < 2.0)
-    logger (1.6.1)
+    logger (1.6.6)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.7)
+    mini_portile2 (2.8.8)
     multi_json (1.15.0)
     mustermann (3.0.3)
       ruby2_keywords (~> 0.0.1)
-    net-http (0.4.1)
+    net-http (0.6.0)
       uri
     nio4r (2.7.4)
-    nokogiri (1.16.7)
+    nokogiri (1.18.3)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     octokit (9.2.0)
       faraday (>= 1, < 3)
       sawyer (~> 0.9)
     ojra (1.1.1)
       faraday (~> 2.9)
-    openssl (3.2.0)
+    openssl (3.3.0)
     public_suffix (6.0.1)
-    puma (6.4.3)
+    puma (6.6.0)
       nio4r (~> 2.0)
     racc (1.8.1)
-    rack (3.1.8)
-    rack-protection (4.0.0)
+    rack (3.1.12)
+    rack-protection (4.1.1)
       base64 (>= 0.1.0)
+      logger (>= 1.6.0)
       rack (>= 3.0.0, < 4)
-    rack-session (2.0.0)
+    rack-session (2.1.0)
+      base64 (>= 0.1.0)
       rack (>= 3.0.0)
-    rack-test (2.1.0)
+    rack-test (2.2.0)
       rack (>= 1.3)
-    redis-client (0.22.2)
+    redis-client (0.24.0)
       connection_pool
-    reverse_markdown (2.1.1)
+    reverse_markdown (3.0.0)
       nokogiri
-    rexml (3.3.9)
+    rexml (3.4.1)
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.2)
+    rspec-core (3.13.3)
       rspec-support (~> 3.13.0)
     rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-mocks (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-support (3.13.1)
+    rspec-support (3.13.2)
     ruby2_keywords (0.0.5)
-    rugged (1.7.2)
+    rugged (1.9.0)
     sawyer (0.9.2)
       addressable (>= 2.3.5)
       faraday (>= 0.17.3, < 3)
@@ -103,27 +105,29 @@ GEM
       multi_json (~> 1.15)
       rexml (~> 3.2, >= 3.2.5)
       thor (~> 1.2, >= 1.2.1)
-    sidekiq (7.3.5)
-      connection_pool (>= 2.3.0)
-      logger
-      rack (>= 2.2.4)
-      redis-client (>= 0.22.2)
-    sinatra (4.0.0)
+    sidekiq (8.0.1)
+      connection_pool (>= 2.5.0)
+      json (>= 2.9.0)
+      logger (>= 1.6.2)
+      rack (>= 3.1.0)
+      redis-client (>= 0.23.2)
+    sinatra (4.1.1)
+      logger (>= 1.6.0)
       mustermann (~> 3.0)
       rack (>= 3.0.0, < 4)
-      rack-protection (= 4.0.0)
+      rack-protection (= 4.1.1)
       rack-session (>= 2.0.0, < 3)
       tilt (~> 2.0)
-    sinatra-contrib (4.0.0)
+    sinatra-contrib (4.1.1)
       multi_json (>= 0.0.2)
       mustermann (~> 3.0)
-      rack-protection (= 4.0.0)
-      sinatra (= 4.0.0)
+      rack-protection (= 4.1.1)
+      sinatra (= 4.1.1)
       tilt (~> 2.0)
     thor (1.3.2)
-    tilt (2.4.0)
-    uri (0.13.1)
-    webmock (3.24.0)
+    tilt (2.6.0)
+    uri (1.0.3)
+    webmock (3.25.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -148,8 +152,8 @@ DEPENDENCIES
   rspec
   serrano
   sidekiq
-  sinatra (= 4.0.0)
-  sinatra-contrib (= 4.0.0)
+  sinatra (= 4.1.1)
+  sinatra-contrib (= 4.1.1)
   webmock
 
 RUBY VERSION