Merge branch 'main' into rails-7.1.5

Gemfile

@@ -96,7 +96,7 @@ gem 'progress_bar'
 gem 'rails_autolink'
 gem 'kramdown'
 gem 'solid_queue', "~> 1.0"
-gem 'mission_control-jobs'
+gem 'mission_control-jobs', "~> 0.5.0"
 gem 'acts-as-taggable-on'
 gem 'resync' # , github: 'nabeta/resync', branch: 'add-datetime'
 gem 'pretender'

Gemfile.lock

@@ -101,7 +101,7 @@ GEM
     bcp47_spec (0.2.1)
     bcrypt (3.1.20)
     benchmark (0.4.0)
-    bigdecimal (3.1.8)
+    bigdecimal (3.1.9)
     bindex (0.8.1)
     bootsnap (1.18.4)
       msgpack (~> 1.2)
@@ -127,13 +127,13 @@ GEM
     climate_control (1.2.0)
     cocoon (1.2.15)
     concurrent-ruby (1.3.4)
-    connection_pool (2.4.1)
+    connection_pool (2.5.0)
     crack (1.0.0)
       bigdecimal
       rexml
     crass (1.0.6)
     csv (3.3.2)
-    database_consistency (1.7.26)
+    database_consistency (2.0.3)
       activerecord (>= 3.2)
     date (3.4.1)
     date_validator (0.12.0)
@@ -180,7 +180,7 @@ GEM
       multipart-post (~> 2.0)
     faraday-net_http (3.4.0)
       net-http (>= 0.5.0)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     friendly_id (5.5.1)
       activerecord (>= 4.0.0)
     fugit (1.11.1)
@@ -199,7 +199,7 @@ GEM
     globalize-accessors (0.3.0)
       globalize (>= 5.0.0)
     hashdiff (1.1.2)
-    highline (3.1.1)
+    highline (3.1.2)
       reline
     htmlentities (4.3.4)
     i18n (1.14.6)
@@ -250,8 +250,8 @@ GEM
     lisbn (0.3.2)
       nokogiri
       nori (~> 2.0)
-    logger (1.6.4)
-    loofah (2.23.1)
+    logger (1.6.5)
+    loofah (2.24.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     mail (2.8.1)
@@ -264,11 +264,11 @@ GEM
     mime-types (3.6.0)
       logger
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2024.1203)
+    mime-types-data (3.2025.0107)
     mini_magick (4.13.2)
     mini_mime (1.1.5)
     minitest (5.25.4)
-    mission_control-jobs (1.0.1)
+    mission_control-jobs (0.5.0)
       actioncable (>= 7.1)
       actionpack (>= 7.1)
       activejob (>= 7.1)
@@ -283,7 +283,7 @@ GEM
     mutex_m (0.3.0)
     net-http (0.6.0)
       uri
-    net-imap (0.5.4)
+    net-imap (0.5.5)
       date
       net-protocol
     net-pop (0.1.2)
@@ -293,7 +293,7 @@ GEM
     net-smtp (0.5.0)
       net-protocol
     nio4r (2.7.4)
-    nokogiri (1.17.2-x86_64-linux)
+    nokogiri (1.18.1-x86_64-linux-gnu)
       racc (~> 1.4)
     nori (2.7.1)
       bigdecimal
@@ -304,7 +304,7 @@ GEM
     options (2.3.2)
     orm_adapter (0.5.0)
     parallel (1.26.3)
-    parallel_tests (4.7.2)
+    parallel_tests (4.9.0)
       parallel
     pg (1.5.9)
     pr_geohash (1.0.0)
@@ -326,9 +326,10 @@ GEM
     rack (3.1.8)
     rack-proxy (0.7.7)
       rack
-    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)
     rackup (2.2.1)
       rack (>= 3)
@@ -388,9 +389,9 @@ GEM
       psych (>= 4.0.0)
     redis (5.3.0)
       redis-client (>= 0.22.0)
-    redis-client (0.23.0)
+    redis-client (0.23.1)
       connection_pool
-    regexp_parser (2.9.3)
+    regexp_parser (2.10.0)
     reline (0.6.0)
       io-console (~> 0.5)
     request_store (1.7.0)
@@ -431,7 +432,7 @@ GEM
     ruby-vips (2.2.2)
       ffi (~> 1.12)
       logger
-    rubyzip (2.3.2)
+    rubyzip (2.4.1)
     sassc (2.4.0)
       ffi (~> 1.9)
     sassc-rails (2.1.2)
@@ -457,7 +458,7 @@ GEM
     simplecov_json_formatter (0.1.4)
     sitemap_generator (6.3.0)
       builder (~> 3.0)
-    solid_queue (1.1.0)
+    solid_queue (1.1.2)
       activejob (>= 7.1)
       activerecord (>= 7.1)
       concurrent-ruby (>= 1.3.1)
@@ -519,7 +520,8 @@ GEM
       railties (>= 5.2)
       semantic_range (>= 2.3.0)
     websocket (1.2.11)
-    websocket-driver (0.7.6)
+    websocket-driver (0.7.7)
+      base64
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     xml-mapping (0.10.1)
@@ -567,7 +569,7 @@ DEPENDENCIES
   kt-paperclip
   library_stdnums
   lisbn
-  mission_control-jobs
+  mission_control-jobs (~> 0.5.0)
   oai
   parallel_tests
   pg (~> 1.1)

app/controllers/library_groups_controller.rb

@@ -65,7 +65,7 @@ def library_group_params
       :name, :display_name, :short_name, :my_networks,
       :login_banner, :note, :country_id, :admin_networks, :url,
       :max_number_of_results, :footer_banner, :email,
-      :book_jacket_source, :screenshot_generator, :erms_url,
+      :book_jacket_source, :screenshot_generator,
       :header_logo, :delete_header_logo,
       :allow_bookmark_external_url, # EnjuBookmark
       {

app/models/library_group.rb

@@ -14,7 +14,7 @@ class LibraryGroup < ApplicationRecord
   accepts_nested_attributes_for :colors, update_only: true
   store_accessor :settings,
     :book_jacket_unknown_resource,
-    :erms_url, :amazon_hostname
+    :amazon_hostname
 
   translates :login_banner, :footer_banner
   globalize_accessors

app/views/page/_menu.html.erb

@@ -121,9 +121,6 @@
           <% if defined?(EnjuSearchLog) %>
             <li><%= link_to t('activerecord.models.search_history'), search_histories_path %></li>
           <% end %>
-          <% if @library_group.erms_url %>
-            <li><%= link_to t('page.electronic_resource_management'), URI.parse(@library_group.erms_url).to_s -%></li>
-          <% end %>
           <li><%= link_to t('page.configuration'), page_configuration_path -%></li>
         </ul>
       </li>

config/locales/enju_leaf_en.yml

@@ -284,7 +284,6 @@ en:
     only_lowercase_letters_and_numbers_are_allowed: "is invalid. Only lowercase letters, numbers and underscore are allowed. The first character must be alphabetic."
     not_logged_in: "Not logged in"
     add_child: "Add a child"
-    electronic_resource_management: "Electronic resource management"
     system: System
     manual: Manual
     cannot_parse_yaml_header: "has an invalid YAML header. You must add a space after the header's colon."

config/locales/enju_leaf_ja.yml

@@ -269,7 +269,6 @@ ja:
     only_lowercase_letters_and_numbers_are_allowed: "には英数小文字・アンダースコアのみ使用できます。最初の文字に数字は使用できません。"
     not_logged_in: "ログインしていません"
     add_child: "子を追加"
-    electronic_resource_management: 電子リソース管理
     system: システム
     manual: マニュアル
     cannot_parse_yaml_header: "のYAMLヘッダを読み込めません。ヘッダのコロンの後には、半角スペースを含める必要があります。"