Merge branch 'main' into juliacon

.github/workflows/tests.yml

@@ -15,7 +15,7 @@ jobs:
       - name: Install Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.3.0
+          ruby-version: 3.3.1
           bundler-cache: true
       - name: Install Elasticsearch
         uses: ankane/setup-elasticsearch@v1

.ruby-version

@@ -1 +1 @@
-3.3.0
+3.3.1

Gemfile

@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
-ruby '3.3.0'
+ruby '3.3.1'
 
 gem 'aasm', '~> 5.5.0'
 gem 'chartkick'
@@ -23,7 +23,6 @@ gem "importmap-rails"
 gem "turbo-rails"
 gem "stimulus-rails"
 gem 'responders'
-gem 'newrelic_rpm'
 gem 'sanitize', '~> 6.0.1'
 gem 'searchkick'
 gem 'elasticsearch', '<7.14'

Gemfile.lock

@@ -85,7 +85,7 @@ GEM
       public_suffix (>= 2.0.2, < 6.0)
     afm (0.2.2)
     base64 (0.2.0)
-    bigdecimal (3.1.6)
+    bigdecimal (3.1.7)
     bindex (0.8.1)
     bootsnap (1.18.3)
       msgpack (~> 1.2)
@@ -100,7 +100,7 @@ GEM
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
-    chartkick (5.0.5)
+    chartkick (5.0.6)
     coderay (1.1.3)
     commonmarker (0.23.10)
     concurrent-ruby (1.2.3)
@@ -113,8 +113,7 @@ GEM
     declarative (0.0.20)
     diff-lcs (1.5.1)
     dotenv (2.8.1)
-    drb (2.2.0)
-      ruby2_keywords
+    drb (2.2.1)
     elasticsearch (7.13.3)
       elasticsearch-api (= 7.13.3)
       elasticsearch-transport (= 7.13.3)
@@ -190,27 +189,27 @@ GEM
       activesupport (>= 2)
       nokogiri (>= 1.4)
     httpclient (2.8.3)
-    i18n (1.14.1)
+    i18n (1.14.4)
       concurrent-ruby (~> 1.0)
     importmap-rails (2.0.1)
       actionpack (>= 6.0.0)
       activesupport (>= 6.0.0)
       railties (>= 6.0.0)
     io-console (0.7.2)
-    irb (1.11.2)
+    irb (1.12.0)
       rdoc
       reline (>= 0.4.2)
     issue (1.0.0)
       openssl
       rack
-    jbuilder (2.11.5)
+    jbuilder (2.12.0)
       actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
-    jwt (2.8.0)
+    jwt (2.8.1)
       base64
-    libv8-node (18.16.0.0)
-    libv8-node (18.16.0.0-x86_64-darwin)
-    libv8-node (18.16.0.0-x86_64-linux)
+    libv8-node (21.7.2.0)
+    libv8-node (21.7.2.0-x86_64-darwin)
+    libv8-node (21.7.2.0-x86_64-linux)
     loofah (2.22.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
@@ -219,15 +218,15 @@ GEM
       net-imap
       net-pop
       net-smtp
-    marcel (1.0.2)
+    marcel (1.0.4)
     matrix (0.4.2)
     memoist (0.16.2)
-    method_source (1.0.0)
+    method_source (1.1.0)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.5)
-    mini_racer (0.8.0)
-      libv8-node (~> 18.16.0.0)
-    minitest (5.22.2)
+    mini_portile2 (2.8.6)
+    mini_racer (0.12.0)
+      libv8-node (~> 21.7.2.0)
+    minitest (5.22.3)
     msgpack (1.7.2)
     multi_json (1.15.0)
     multi_xml (0.6.0)
@@ -242,17 +241,16 @@ GEM
       timeout
     net-sftp (4.0.0)
       net-ssh (>= 5.0.0, < 8.0.0)
-    net-smtp (0.4.0.1)
+    net-smtp (0.5.0)
       net-protocol
-    net-ssh (7.2.1)
-    newrelic_rpm (9.7.1)
-    nio4r (2.7.0)
-    nokogiri (1.16.2)
+    net-ssh (7.2.3)
+    nio4r (2.7.1)
+    nokogiri (1.16.4)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.16.2-x86_64-darwin)
+    nokogiri (1.16.4-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.2-x86_64-linux)
+    nokogiri (1.16.4-x86_64-linux)
       racc (~> 1.4)
     oauth2 (2.0.9)
       faraday (>= 0.17.3, < 3.0)
@@ -261,10 +259,10 @@ GEM
       rack (>= 1.2, < 4)
       snaky_hash (~> 2.0)
       version_gem (~> 1.1)
-    octicons (19.8.0)
-    octicons_helper (19.8.0)
+    octicons (19.9.0)
+    octicons_helper (19.9.0)
       actionview
-      octicons (= 19.8.0)
+      octicons (= 19.9.0)
       railties
     octokit (8.1.0)
       base64
@@ -285,7 +283,7 @@ GEM
       omniauth (~> 2.0)
     openssl (3.2.0)
     os (1.1.4)
-    pagy (7.0.4)
+    pagy (8.3.0)
     pdf-reader (2.11.0)
       Ascii85 (~> 1.0)
       afm (~> 0.2.1)
@@ -301,11 +299,11 @@ GEM
       pry (>= 0.13, < 0.15)
     psych (5.1.2)
       stringio
-    public_suffix (5.0.4)
+    public_suffix (5.0.5)
     puma (6.4.2)
       nio4r (~> 2.0)
     racc (1.7.3)
-    rack (3.0.9.1)
+    rack (3.0.10)
     rack-protection (4.0.0)
       base64 (>= 0.1.0)
       rack (>= 3.0.0, < 4)
@@ -345,15 +343,15 @@ GEM
       rake (>= 12.2)
       thor (~> 1.0, >= 1.2.2)
       zeitwerk (~> 2.6)
-    rake (13.1.0)
+    rake (13.2.1)
     rdoc (6.6.3.1)
       psych (>= 4.0.0)
-    redis (5.1.0)
-      redis-client (>= 0.17.0)
-    redis-client (0.20.0)
+    redis (5.2.0)
+      redis-client (>= 0.22.0)
+    redis-client (0.22.1)
       connection_pool
     regexp_parser (2.9.0)
-    reline (0.4.2)
+    reline (0.5.3)
       io-console (~> 0.5)
     representable (3.2.0)
       declarative (< 0.1.0)
@@ -372,15 +370,15 @@ GEM
     rspec-mocks (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-rails (6.1.1)
+    rspec-rails (6.1.2)
       actionpack (>= 6.1)
       activesupport (>= 6.1)
       railties (>= 6.1)
-      rspec-core (~> 3.12)
-      rspec-expectations (~> 3.12)
-      rspec-mocks (~> 3.12)
-      rspec-support (~> 3.12)
-    rspec-support (3.13.0)
+      rspec-core (~> 3.13)
+      rspec-expectations (~> 3.13)
+      rspec-mocks (~> 3.13)
+      rspec-support (~> 3.13)
+    rspec-support (3.13.1)
     ruby-rc4 (0.1.5)
     ruby2_keywords (0.0.5)
     ruby_dig (0.0.2)
@@ -402,7 +400,7 @@ GEM
     searchkick (5.3.1)
       activemodel (>= 6.1)
       hashie
-    selenium-webdriver (4.18.1)
+    selenium-webdriver (4.20.1)
       base64 (~> 0.2)
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)
@@ -415,7 +413,7 @@ GEM
     snaky_hash (2.0.1)
       hashie
       version_gem (~> 1.1, >= 1.1.1)
-    spring (4.1.3)
+    spring (4.2.1)
     spring-commands-rspec (1.0.4)
       spring (>= 0.9.1)
     sprockets (4.2.1)
@@ -428,12 +426,13 @@ GEM
     stimulus-rails (1.3.3)
       railties (>= 6.0.0)
     stringio (3.1.0)
-    thor (1.3.0)
+    thor (1.3.1)
     tilt (2.3.0)
     timeout (0.4.1)
     trailblazer-option (0.1.2)
-    ttfunk (1.7.0)
-    turbo-rails (2.0.4)
+    ttfunk (1.8.0)
+      bigdecimal (~> 3.1)
+    turbo-rails (2.0.5)
       actionpack (>= 6.0.0)
       activejob (>= 6.0.0)
       railties (>= 6.0.0)
@@ -443,13 +442,13 @@ GEM
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
     vcr (6.2.0)
-    version_gem (1.1.3)
+    version_gem (1.1.4)
     web-console (4.2.1)
       actionview (>= 6.0.0)
       activemodel (>= 6.0.0)
       bindex (>= 0.4.0)
       railties (>= 6.0.0)
-    webmock (3.22.0)
+    webmock (3.23.0)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -486,7 +485,6 @@ DEPENDENCIES
   jbuilder (~> 2.11)
   mini_racer
   net-sftp (~> 4.0)
-  newrelic_rpm
   octicons_helper
   octokit
   omniauth-orcid (~> 2.1.1)
@@ -515,7 +513,7 @@ DEPENDENCIES
   webmock
 
 RUBY VERSION
-   ruby 3.3.0p0
+   ruby 3.3.1p55
 
 BUNDLED WITH
-   2.5.4
+   2.5.9

app/helpers/pagination_helper.rb

@@ -1,16 +1,16 @@
 module PaginationHelper
   def pagy_pagination(pagy)
-    link = pagy_link_proc(pagy)
+    link = pagy_anchor(pagy)
     pagination_links = "<div class='pagination'>"
 
     if pagy.prev
-      pagination_links += link.call(pagy.prev, pagy_t('pagy.nav.prev'), 'aria-label="previous"')
+      pagination_links += link.call(pagy.prev, pagy_t('pagy.nav.prev'), aria_label: "previous")
     else
       pagination_links += "<span class='page prev disabled'>#{pagy_t('pagy.nav.prev')}</span>"
     end
 
     if pagy.next
-      pagination_links += link.call(pagy.next, pagy_t('pagy.nav.next'), 'aria-label="next"')
+      pagination_links += link.call(pagy.next, pagy_t('pagy.nav.next'), aria_label: "next")
     else
       pagination_links += "<span class='page next disabled'>#{pagy_t('pagy.nav.next')}</span>"
     end

app/views/home/reviews.html.erb

@@ -75,7 +75,7 @@
 
   <div class="row">
     <div class="pagination_helper">
-      <%== pagy_info(@pagy, item_i18n_key: "paper") %>
+      <%== pagy_info(@pagy, item_name: t("paper", count: @papers.size)) %>
     </div>
     <%= pagy_pagination @pagy %>
   </div>

app/views/invitations/index.html.erb

@@ -47,7 +47,7 @@
     </table>
     <div class="row">
       <div class="pagination_helper">
-        <%== pagy_info(@pagy, item_i18n_key: "invitation") %>
+        <%== pagy_info(@pagy, item_name: t("invitation", count: @invitations.size)) %>
       </div>
       <%= pagy_pagination @pagy %>
     </div>

app/views/papers/index.html.erb

@@ -45,7 +45,7 @@
   </div>
   <div class="row">
     <div class="pagination_helper">
-      <%== pagy_info(@pagy, item_i18n_key: "paper") %>
+      <%== pagy_info(@pagy, item_name: t("paper", count: @papers.size)) %>
     </div>
     <%= pagy_pagination @pagy %>
   </div>

app/views/toc/_list.html.erb

@@ -19,7 +19,7 @@
 
   <div class="row">
     <div class="pagination_helper">
-      <%== pagy_info(@pagy, item_i18n_key: "paper") %>
+      <%== pagy_info(@pagy, item_name: t("paper", count: @papers.size)) %>
     </div>
     <%= pagy_pagination(@pagy) if @pagy.pages > 1 %>
   </div>

docs/submitting.md

@@ -10,7 +10,8 @@ But please read these instructions carefully for a streamlined submission.
 - The software must have an **obvious** research application.
 - You must be a major contributor to the software you are submitting, and have a GitHub account to participate in the review process.
 - Your paper must not focus on new research results accomplished with the software.
-- Your paper (`paper.md` and BibTeX files, plus any figures) must be hosted in a Git-based repository together with your software (although they may be in a short-lived branch which is never merged with the default).
+- Your paper (`paper.md` and BibTeX files, plus any figures) must be hosted in a Git-based repository together with your software.
+- The paper may be in a short-lived branch which is never merged with the default, although if you do this, make sure this branch is _created_ from the default so that it also includes the source code of your submission.
 
 In addition, the software associated with your submission must: