diff --git a/app/views/layouts/admin/application.html.erb b/app/views/layouts/admin/application.html.erb
index b524ffdd..75dbe7a5 100644
--- a/app/views/layouts/admin/application.html.erb
+++ b/app/views/layouts/admin/application.html.erb
@@ -22,7 +22,7 @@ By default, it renders:
<%= content_for(:title) %> - <%= application_title %>
<%= render "stylesheet" %>
- <%= stylesheet_link_tag "administrate", data: { turbo_track: "reload" } %>
+ <%= stylesheet_link_tag "administrate/application", data: { turbo_track: "reload" } %>
<%= csrf_meta_tags %>
<%= csp_meta_tag if defined?(csp_meta_tag) %>
From f097d22fe10ccc0aa6e69c9b59897a974107d573 Mon Sep 17 00:00:00 2001
From: jazairi <16103405+jazairi@users.noreply.github.com>
Date: Mon, 20 Jul 2026 12:14:35 -0700
Subject: [PATCH 11/13] Add fallback for unset env in Devise config
Rails 8 initializes Devise before loading test env
---
config/initializers/devise.rb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index 18c00753..620a82dd 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -56,8 +56,8 @@
idp_sso_target_url: ENV['IDP_SSO_URL'],
idp_cert: idp_metadata[:idp_cert],
idp_cert_multi: idp_metadata[:idp_cert_multi],
- certificate: Base64.strict_decode64(ENV['SP_CERTIFICATE']),
- private_key: Base64.strict_decode64(ENV['SP_PRIVATE_KEY']),
+ certificate: Base64.strict_decode64(ENV.fetch('SP_CERTIFICATE', '')),
+ private_key: Base64.strict_decode64(ENV.fetch('SP_PRIVATE_KEY', '')),
issuer: ENV['SP_ENTITY_ID'],
request_attributes: {},
allowed_clock_drift: 2.seconds,
From 8a931973ce8aaf7cd17671b393cb5b2313c94ef4 Mon Sep 17 00:00:00 2001
From: jazairi <16103405+jazairi@users.noreply.github.com>
Date: Mon, 20 Jul 2026 16:58:34 -0700
Subject: [PATCH 12/13] Fix pluralization
Rails 8 requires explicit pluralization rules for irregular verbs
---
app/models/report.rb | 14 +++++++-------
app/views/report/_card.html.erb | 2 +-
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/app/models/report.rb b/app/models/report.rb
index 1440b102..a5a341a2 100644
--- a/app/models/report.rb
+++ b/app/models/report.rb
@@ -4,7 +4,7 @@ class Report
def card_empty_theses(collection)
{
'value' => collection.count,
- 'verb' => 'has',
+ 'verb' => ['has', 'have'],
'label' => 'no attached files'
}
end
@@ -13,7 +13,7 @@ def card_files(collection, term)
subset = collection.joins(:files_attachments)
{
'value' => subset.pluck(:id).uniq.count,
- 'verb' => 'has',
+ 'verb' => ['has', 'have'],
'label' => 'files attached',
'note' => 'Only theses with a status of "Not ready for publication" and "Publication review" will be visible ' \
'in the processing queue.',
@@ -35,7 +35,7 @@ def card_issues(collection)
def card_multiple_authors(collection)
{
'value' => collection.joins(:authors).group('theses.id').having('COUNT(authors.id) > 1').length,
- 'verb' => 'has',
+ 'verb' => ['has', 'have'],
'label' => 'multiple authors'
}
end
@@ -43,7 +43,7 @@ def card_multiple_authors(collection)
def card_multiple_degrees(collection)
{
'value' => collection.joins(:degrees).group('theses.id').having('COUNT(degrees.id) > 1').length,
- 'verb' => 'has',
+ 'verb' => ['has', 'have'],
'label' => 'multiple degrees'
}
end
@@ -51,7 +51,7 @@ def card_multiple_degrees(collection)
def card_multiple_departments(collection)
{
'value' => collection.joins(:departments).group('theses.id').having('COUNT(departments.id) > 1').length,
- 'verb' => 'has',
+ 'verb' => ['has', 'have'],
'label' => 'multiple departments'
}
end
@@ -60,7 +60,7 @@ def card_overall(collection, term)
searchterm = term if term != 'all'
{
'value' => collection.count,
- 'verb' => 'thesis record',
+ 'verb' => ['thesis record', 'thesis records'],
'link' => {
'url' => url_helpers.admin_theses_path(search: searchterm),
'text' => 'See all in admin dashboard'
@@ -71,7 +71,7 @@ def card_overall(collection, term)
def card_student_contributions(collection)
{
'value' => collection.map(&:student_contributed?).count(true),
- 'verb' => 'has',
+ 'verb' => ['has', 'have'],
'label' => 'had metadata contributed by students'
}
end
diff --git a/app/views/report/_card.html.erb b/app/views/report/_card.html.erb
index 72697362..2a1a5638 100644
--- a/app/views/report/_card.html.erb
+++ b/app/views/report/_card.html.erb
@@ -1,7 +1,7 @@
message <% end %>hero-text">
<% if card[1]["verb"] %>
- <%= pluralize(card[1]["value"].to_i, card[1]["verb"]) %> <%= card[1]["label"] %>
+ <%= pluralize(card[1]["value"].to_i, card[1]["verb"][0], card[1]["verb"][1]) %> <%= card[1]["label"] %>
<% else %>
<%= card[1]["value"] %> <%= card[1]["label"] %>
<% end %>
From c5b90cf2544251139dd2a24d410b574b69acf998 Mon Sep 17 00:00:00 2001
From: jazairi <16103405+jazairi@users.noreply.github.com>
Date: Tue, 21 Jul 2026 09:34:08 -0700
Subject: [PATCH 13/13] Implement code review feedback
---
config/ci.rb | 2 +-
config/environments/production.rb | 9 +++++++--
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/config/ci.rb b/config/ci.rb
index 7e3f04c4..9014db21 100644
--- a/config/ci.rb
+++ b/config/ci.rb
@@ -5,7 +5,7 @@
step "Style: Ruby", "bin/rubocop"
- step "Security: Importmap vulnerability audit", "bin/importmap audit"
+ # step "Security: Importmap vulnerability audit", "bin/importmap audit"
step "Tests: Rails", "bin/rails test"
step "Tests: Seeds", "env RAILS_ENV=test bin/rails db:seed:replant"
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 8d57e138..5640fff3 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -15,6 +15,9 @@
# Turn on fragment caching in view templates.
config.action_controller.perform_caching = true
+ # Disable serving static files from `public/`, relying on NGINX/Apache to do so instead.
+ config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present?
+
# Cache assets for far-future expiry since they are all digest stamped.
config.public_file_server.headers = { "cache-control" => "public, max-age=#{1.year.to_i}" }
@@ -33,9 +36,11 @@
# Skip http-to-https redirect for the default health check endpoint.
# config.ssl_options = { redirect: { exclude: ->(request) { request.path == "/up" } } }
- # Log to STDOUT with the current request id as a default log tag.
+ # Log to STDOUT by default
config.log_tags = [ :request_id ]
- config.logger = ActiveSupport::TaggedLogging.logger(STDOUT)
+ config.logger = ActiveSupport::Logger.new(STDOUT)
+ .tap { |logger| logger.formatter = ::Logger::Formatter.new }
+ .then { |logger| ActiveSupport::TaggedLogging.new(logger) }
# Change to "debug" to log everything (including potentially personally-identifiable information!).
config.log_level = ENV.fetch("RAILS_LOG_LEVEL", "info")