Merge branch 'main' into bump_ruby_3.4

Author: pgwillia

.erb-lint.yml renamed to .erb_lint.yml

@@ -59,7 +59,7 @@ jobs:
         run: yarn run lint-css
 
       - name: Run ERBLint
-        run: bundle exec erblint .
+        run: bundle exec erb_lint .
 
       - name: Run Tests
         env:

.github/workflows/push.yml

@@ -9,11 +9,13 @@ New entries in this file should aim to provide a meaningful amount of informatio
 
 ## [Unreleased]
 
-### Changes
+### Changed
+* skip brakeman Remove brakeman's ruby EOL check
 * bump Ruby 3.4 [ualbertalib/library_applications_development#163](https://github.com/ualbertalib/library_applications_development/issues/163)
 
 ### Chores
 * Bump bundler in Gemfile.lock to match production and build environments 
+* Bump erb_lint from 0.7.0 to 0.9.0 [PR#3689](https://github.com/ualbertalib/jupiter/pull/3689)
 
 ## 2.10.2 - 2025-01-15
 

CHANGELOG.md

@@ -5,7 +5,7 @@ ruby '>= 3.1.4', '< 3.5'
 
 # Core Rails stuff
 gem 'image_processing' # for ActiveStorage Variants
-gem 'puma', '~> 6.4'
+gem 'puma', '~> 6.6'
 gem 'rails', '~> 7.1.3'
 
 # Assets
@@ -24,14 +24,14 @@ gem 'simple_form'
 gem 'acts_as_rdfable', github: 'ualbertalib/acts_as_rdfable', tag: 'v0.5.0'
 gem 'rdf', '~> 3.3.2'
 gem 'rdf-n3', '~> 3.3.0'
-gem 'rdf-vocab', '~> 3.3.1' # this gem changed predicate names without warning, be cautious and test with migrations
+gem 'rdf-vocab', '~> 3.3.2' # this gem changed predicate names without warning, be cautious and test with migrations
 
 # Database stuff
 gem 'connection_pool'
 gem 'pg', '~> 1.5.9'
 gem 'redis', '~> 4.8'
 gem 'rsolr'
-gem 'strong_migrations', '~> 2.1.0'
+gem 'strong_migrations', '~> 2.2.0'
 
 # Authentication
 gem 'bcrypt', '>= 3.1.13'
@@ -44,7 +44,7 @@ gem 'pundit', '2.4.0'
 
 # Background tasks
 gem 'sidekiq', '~> 7.3'
-gem 'sidekiq-cron', '~> 2.0'
+gem 'sidekiq-cron', '~> 2.1'
 gem 'sidekiq-unique-jobs', '~> 8.0'
 
 # Misc Utilities
@@ -54,15 +54,15 @@ gem 'csv', '~> 3.3', '>= 3.3.2' # CSV parsing
 gem 'datacite-client', github: 'ualbertalib/datacite-client', tag: 'v0.1.0', require: 'datacite'
 gem 'differ' # Used to diff two strings
 gem 'draper'
-gem 'edtf', '~> 3.1' # parsing Extended Date/Time Format
+gem 'edtf', '~> 3.2' # parsing Extended Date/Time Format
 gem 'flipper', '~> 1.3.2' # Feature flags for Ruby
 gem 'flipper-active_record', '~> 1.3.2' # Store feature flags in ActiveRecord
 gem 'flipper-ui', '~> 1.3.2' # UI for feature flags
 gem 'jbuilder' # generate JSON objects
 gem 'kaminari' # Pagination
 gem 'ostruct', '~> 0.6.1' # similar to hash
 gem 'paper_trail', '~> 15.2.0' # Track object changes
-gem 'ransack', '4.2.1' # ActiveRecord search/filter
+gem 'ransack', '4.3.0' # ActiveRecord search/filter
 gem 'redcarpet', '~> 3.6', require: ['redcarpet', 'redcarpet/render_strip'] # Markdown to (X)HTML parser
 gem 'uuidtools'
 gem 'voight_kampff', '~> 2.0', require: 'voight_kampff/rails' # bot detection
@@ -96,7 +96,7 @@ group :development, :test do
   # See https://guides.rubyonrails.org/debugging_rails_applications.html#debugging-with-the-debug-gem
   gem 'debug', platforms: [:mri, :mingw, :x64_mingw]
 
-  gem 'rubocop', '~> 1.68.0', require: false
+  gem 'rubocop', '~> 1.71.2', require: false
   gem 'rubocop-minitest', require: false
   gem 'rubocop-performance', require: false
   gem 'rubocop-rails', require: false