From dab638d51e58db674ab35f578647334c6059599a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 8 Jan 2026 22:44:20 +0000 Subject: [PATCH 1/7] chore(deps): update all non-major bundler dependencies --- Gemfile | 18 ++++++++--------- Gemfile.lock | 56 ++++++++++++++++++++++++++-------------------------- 2 files changed, 37 insertions(+), 37 deletions(-) diff --git a/Gemfile b/Gemfile index 5c5494961..829da4fac 100644 --- a/Gemfile +++ b/Gemfile @@ -1,8 +1,8 @@ source 'https://rubygems.org' gem 'active_model_otp', '~> 2.3', '>= 2.3.4' -gem 'bcrypt', '~> 3.1.20' -gem 'bootsnap', '~> 1.19.0' +gem 'bcrypt', '~> 3.1.21' +gem 'bootsnap', '~> 1.20.1' gem 'browser', '~> 6.2.0' gem 'cssbundling-rails', '~> 1.4', '>= 1.4.3' gem 'dartsass-rails', '~> 0.5.1' @@ -24,7 +24,7 @@ gem 'omniauth-identity', '~> 3.1', '>= 3.1.5' gem 'omniauth-oauth2', '~> 1.9.0' gem 'paper_trail', '~> 17.0.0' gem 'paranoia', '~> 3.1.0' -gem 'pg', '~> 1.6.2' +gem 'pg', '~> 1.6.3' gem 'puma', '~> 7.1.0' gem 'pundit', '~> 2.5.2' gem 'rack-attack', '~> 6.8.0' @@ -32,13 +32,13 @@ gem 'rails', '~> 7.2.3' gem 'rails-i18n', '~> 7.0.10' gem 'redis', '~> 5.4', '>= 5.4.1' gem 'rest-client', '~> 2.1.0' -gem 'rqrcode', '~> 3.1', '>= 3.1.1' +gem 'rqrcode', '~> 3.2' gem 'sentry-rails', '~> 6.2' gem 'sentry-ruby', '~> 6.2' gem 'sentry-sidekiq', '~> 6.2' -gem 'sidekiq', '~> 8.0.10' +gem 'sidekiq', '~> 8.1.0' gem 'sidekiq-scheduler', '~> 6.0.1' -gem 'simple_form', '~> 5.4.0' +gem 'simple_form', '~> 5.4.1' gem 'sprockets-rails', '~> 3.5', '>= 3.5.2' gem 'turbo-rails', '~> 2.0', '>= 2.0.20' gem 'uglifier', '~> 4.2.1' @@ -49,7 +49,7 @@ gem 'wkhtmltopdf-binary', '~> 0.12.6.10' group :development, :test do gem 'awesome_print', '~> 1.9.2' gem 'better_errors', '~> 2.10.1' - gem 'brakeman', '~> 7.1.1', require: false + gem 'brakeman', '~> 7.1.2', require: false gem 'bullet', '~> 8.1' gem 'colorize', '~> 1.1.0' gem 'database_consistency', '~> 2.1.1' @@ -78,8 +78,8 @@ group :test do gem 'rubocop', '~> 1.82.1', require: false gem 'rubocop-factory_bot', '~> 2.28.0', require: false gem 'rubocop-performance', '~> 1.26', '>= 1.26.1', require: false - gem 'rubocop-rails', '~> 2.34', '>= 2.34.2', require: false - gem 'rubocop-rspec', '~> 3.8', require: false + gem 'rubocop-rails', '~> 2.34', '>= 2.34.3', require: false + gem 'rubocop-rspec', '~> 3.9', require: false gem 'rubocop-rspec_rails', '~> 2.32', require: false gem 'simplecov', '~> 0.22.0', require: false gem 'simplecov-lcov', '~> 0.9.0', require: false diff --git a/Gemfile.lock b/Gemfile.lock index 461a586d2..429f66f9a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -84,7 +84,7 @@ GEM ast (2.4.3) awesome_print (1.9.2) base64 (0.3.0) - bcrypt (3.1.20) + bcrypt (3.1.21) benchmark (0.5.0) better_errors (2.10.1) erubi (>= 1.0.0) @@ -92,9 +92,9 @@ GEM rouge (>= 1.0.0) bigdecimal (3.3.1) bindex (0.8.1) - bootsnap (1.19.0) + bootsnap (1.20.1) msgpack (~> 1.2) - brakeman (7.1.1) + brakeman (7.1.2) racc browser (6.2.0) builder (3.3.0) @@ -118,7 +118,7 @@ GEM coderay (1.1.3) colorize (1.1.0) concurrent-ruby (1.3.6) - connection_pool (2.5.5) + connection_pool (3.0.2) crass (1.0.6) cssbundling-rails (1.4.3) railties (>= 6.0.0) @@ -339,7 +339,7 @@ GEM parser (3.3.10.0) ast (~> 2.4.1) racc - pg (1.6.2-x86_64-linux) + pg (1.6.3-x86_64-linux) pp (0.6.3) prettyprint prettyprint (0.2.0) @@ -426,7 +426,7 @@ GEM tsort redis (5.4.1) redis-client (>= 0.22.0) - redis-client (0.26.2) + redis-client (0.26.3) connection_pool regexp_parser (2.11.3) reline (0.6.3) @@ -443,10 +443,10 @@ GEM netrc (~> 0.8) rotp (6.3.0) rouge (4.6.1) - rqrcode (3.1.1) + rqrcode (3.2.0) chunky_png (~> 1.0) rqrcode_core (~> 2.0) - rqrcode_core (2.0.1) + rqrcode_core (2.1.0) rspec (3.13.2) rspec-core (~> 3.13.0) rspec-expectations (~> 3.13.0) @@ -479,9 +479,9 @@ GEM rubocop-ast (>= 1.48.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 4.0) - rubocop-ast (1.48.0) + rubocop-ast (1.49.0) parser (>= 3.3.7.2) - prism (~> 1.4) + prism (~> 1.7) rubocop-factory_bot (2.28.0) lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) @@ -489,13 +489,13 @@ GEM lint_roller (~> 1.1) rubocop (>= 1.75.0, < 2.0) rubocop-ast (>= 1.47.1, < 2.0) - rubocop-rails (2.34.2) + rubocop-rails (2.34.3) activesupport (>= 4.2.0) lint_roller (~> 1.1) rack (>= 1.1) rubocop (>= 1.75.0, < 2.0) rubocop-ast (>= 1.44.0, < 2.0) - rubocop-rspec (3.8.0) + rubocop-rspec (3.9.0) lint_roller (~> 1.1) rubocop (~> 1.81) rubocop-rspec_rails (2.32.0) @@ -518,16 +518,16 @@ GEM sentry-ruby (~> 6.2.0) sidekiq (>= 5.0) shellany (0.0.1) - sidekiq (8.0.10) - connection_pool (>= 2.5.0) - json (>= 2.9.0) - logger (>= 1.6.2) - rack (>= 3.1.0) - redis-client (>= 0.23.2) + sidekiq (8.1.0) + connection_pool (>= 3.0.0) + json (>= 2.16.0) + logger (>= 1.7.0) + rack (>= 3.2.0) + redis-client (>= 0.26.0) sidekiq-scheduler (6.0.1) rufus-scheduler (~> 3.2) sidekiq (>= 7.3, < 9) - simple_form (5.4.0) + simple_form (5.4.1) actionpack (>= 7.0) activemodel (>= 7.0) simplecov (0.22.0) @@ -608,10 +608,10 @@ PLATFORMS DEPENDENCIES active_model_otp (~> 2.3, >= 2.3.4) awesome_print (~> 1.9.2) - bcrypt (~> 3.1.20) + bcrypt (~> 3.1.21) better_errors (~> 2.10.1) - bootsnap (~> 1.19.0) - brakeman (~> 7.1.1) + bootsnap (~> 1.20.1) + brakeman (~> 7.1.2) browser (~> 6.2.0) bullet (~> 8.1) capistrano-sidekiq (~> 3.2.0) @@ -643,7 +643,7 @@ DEPENDENCIES omniauth-oauth2 (~> 1.9.0) paper_trail (~> 17.0.0) paranoia (~> 3.1.0) - pg (~> 1.6.2) + pg (~> 1.6.3) pry-byebug (~> 3.11.0) pry-rails (~> 0.3.11) puma (~> 7.1.0) @@ -655,20 +655,20 @@ DEPENDENCIES rb-readline (~> 0.5.5) redis (~> 5.4, >= 5.4.1) rest-client (~> 2.1.0) - rqrcode (~> 3.1, >= 3.1.1) + rqrcode (~> 3.2) rspec-rails (~> 8.0.2) rubocop (~> 1.82.1) rubocop-factory_bot (~> 2.28.0) rubocop-performance (~> 1.26, >= 1.26.1) - rubocop-rails (~> 2.34, >= 2.34.2) - rubocop-rspec (~> 3.8) + rubocop-rails (~> 2.34, >= 2.34.3) + rubocop-rspec (~> 3.9) rubocop-rspec_rails (~> 2.32) sentry-rails (~> 6.2) sentry-ruby (~> 6.2) sentry-sidekiq (~> 6.2) - sidekiq (~> 8.0.10) + sidekiq (~> 8.1.0) sidekiq-scheduler (~> 6.0.1) - simple_form (~> 5.4.0) + simple_form (~> 5.4.1) simplecov (~> 0.22.0) simplecov-lcov (~> 0.9.0) spring (~> 4.4.0) From 75948700a1ea05d276a0d30b21e20f2dff526b09 Mon Sep 17 00:00:00 2001 From: Lodewiges Date: Mon, 12 Jan 2026 01:11:35 +0100 Subject: [PATCH 2/7] try something --- config/application.rb | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/config/application.rb b/config/application.rb index 9883b0502..c97a4479c 100644 --- a/config/application.rb +++ b/config/application.rb @@ -28,10 +28,22 @@ class Application < Rails::Application config.i18n.default_locale = :nl config.i18n.fallbacks = [:nl] - config.cache_store = :redis_cache_store, { - url: Rails.application.config_for(:cable)['url'], - pool: { size: ENV.fetch('RAILS_MAX_THREADS', 5).to_i, timeout: 5 } - } + redis_url = ENV['REDIS_URL'] + redis_url ||= begin + cable_cfg = Rails.application.config_for(:cable) + cable_cfg['url'] if cable_cfg.present? + rescue StandardError + nil + end + + if redis_url.present? + config.cache_store = :redis_cache_store, { + url: redis_url, + pool: { size: ENV.fetch('RAILS_MAX_THREADS', 5).to_i, timeout: 5 } + } + else + config.cache_store = :memory_store + end config.active_job.queue_adapter = :sidekiq config.exceptions_app = routes From 4bbd90cd13cb00dd5e110e246ea9cce636cba05e Mon Sep 17 00:00:00 2001 From: Lodewiges Date: Mon, 12 Jan 2026 01:16:25 +0100 Subject: [PATCH 3/7] give it another shot --- config/application.rb | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/config/application.rb b/config/application.rb index c97a4479c..2c5c9ba0b 100644 --- a/config/application.rb +++ b/config/application.rb @@ -28,12 +28,11 @@ class Application < Rails::Application config.i18n.default_locale = :nl config.i18n.fallbacks = [:nl] + # Build Redis URL from environment variables redis_url = ENV['REDIS_URL'] - redis_url ||= begin - cable_cfg = Rails.application.config_for(:cable) - cable_cfg['url'] if cable_cfg.present? - rescue StandardError - nil + if redis_url.blank? && ENV['REDIS_HOST'].present? + password = ENV['REDIS_PASSWORD'].present? ? ":#{ENV['REDIS_PASSWORD']}@" : ':' + redis_url = "redis://#{password}#{ENV['REDIS_HOST']}:#{ENV.fetch('REDIS_PORT', 6379)}/1" end if redis_url.present? From a3f3902ddede1f77d4bb527e5cec5e7b349c4d0a Mon Sep 17 00:00:00 2001 From: Lodewiges Date: Mon, 12 Jan 2026 01:29:38 +0100 Subject: [PATCH 4/7] fix lint --- config/application.rb | 25 ++++++++++--------------- config/initializers/sidekiq.rb | 5 +++-- 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/config/application.rb b/config/application.rb index 2c5c9ba0b..7f1c50623 100644 --- a/config/application.rb +++ b/config/application.rb @@ -28,21 +28,16 @@ class Application < Rails::Application config.i18n.default_locale = :nl config.i18n.fallbacks = [:nl] - # Build Redis URL from environment variables - redis_url = ENV['REDIS_URL'] - if redis_url.blank? && ENV['REDIS_HOST'].present? - password = ENV['REDIS_PASSWORD'].present? ? ":#{ENV['REDIS_PASSWORD']}@" : ':' - redis_url = "redis://#{password}#{ENV['REDIS_HOST']}:#{ENV.fetch('REDIS_PORT', 6379)}/1" - end - - if redis_url.present? - config.cache_store = :redis_cache_store, { - url: redis_url, - pool: { size: ENV.fetch('RAILS_MAX_THREADS', 5).to_i, timeout: 5 } - } - else - config.cache_store = :memory_store - end + config.cache_store = if ENV['REDIS_HOST'].present? + redis_password = ENV['REDIS_PASSWORD'].present? ? ":#{ENV['REDIS_PASSWORD']}@" : ':' + redis_url = "redis://#{redis_password}#{ENV['REDIS_HOST']}:#{ENV.fetch('REDIS_PORT', 6379)}/1" + :redis_cache_store, { + url: redis_url, + pool: { size: ENV.fetch('RAILS_MAX_THREADS', 5).to_i, timeout: 5 } + } + else + :memory_store + end config.active_job.queue_adapter = :sidekiq config.exceptions_app = routes diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb index 7b9edb7b0..66f68ba2d 100644 --- a/config/initializers/sidekiq.rb +++ b/config/initializers/sidekiq.rb @@ -1,6 +1,7 @@ -redis_url = Rails.application.config_for(:cable)['url'] +if ENV['REDIS_HOST'].present? + redis_password = ENV['REDIS_PASSWORD'].present? ? ":#{ENV['REDIS_PASSWORD']}@" : ':' + redis_url = "redis://#{redis_password}#{ENV['REDIS_HOST']}:#{ENV.fetch('REDIS_PORT', 6379)}/1" -if redis_url Sidekiq.configure_server do |config| config.redis = { url: redis_url, From 3fc3fe0c5aa3bfdb305e27013911c650c3ebaf8a Mon Sep 17 00:00:00 2001 From: Lodewiges Date: Mon, 12 Jan 2026 02:18:47 +0100 Subject: [PATCH 5/7] make it a seperate file --- config/application.rb | 10 ---------- config/initializers/cache_store.rb | 13 +++++++++++++ 2 files changed, 13 insertions(+), 10 deletions(-) create mode 100644 config/initializers/cache_store.rb diff --git a/config/application.rb b/config/application.rb index 7f1c50623..fb75817e8 100644 --- a/config/application.rb +++ b/config/application.rb @@ -28,16 +28,6 @@ class Application < Rails::Application config.i18n.default_locale = :nl config.i18n.fallbacks = [:nl] - config.cache_store = if ENV['REDIS_HOST'].present? - redis_password = ENV['REDIS_PASSWORD'].present? ? ":#{ENV['REDIS_PASSWORD']}@" : ':' - redis_url = "redis://#{redis_password}#{ENV['REDIS_HOST']}:#{ENV.fetch('REDIS_PORT', 6379)}/1" - :redis_cache_store, { - url: redis_url, - pool: { size: ENV.fetch('RAILS_MAX_THREADS', 5).to_i, timeout: 5 } - } - else - :memory_store - end config.active_job.queue_adapter = :sidekiq config.exceptions_app = routes diff --git a/config/initializers/cache_store.rb b/config/initializers/cache_store.rb new file mode 100644 index 000000000..03e58f675 --- /dev/null +++ b/config/initializers/cache_store.rb @@ -0,0 +1,13 @@ +# config/initializers/cache_store.rb + +cache_config = if ENV['REDIS_HOST'].present? + redis_password = ENV['REDIS_PASSWORD'].present? ? ":#{ENV['REDIS_PASSWORD']}@" : ':' + redis_url = "redis://#{redis_password}#{ENV['REDIS_HOST']}:#{ENV.fetch('REDIS_PORT', 6379)}/1" + [:redis_cache_store, { + url: redis_url, + pool: { size: ENV.fetch('RAILS_MAX_THREADS', 5).to_i, timeout: 5 } + }] + else + [:memory_store] + end +Rails.application.config.cache_store(*cache_config) From 79b1de60668054278746952b671d88eb5f7dfe46 Mon Sep 17 00:00:00 2001 From: Lodewiges Date: Mon, 12 Jan 2026 02:30:29 +0100 Subject: [PATCH 6/7] give this another go --- config/application.rb | 10 ++++++++++ config/initializers/cache_store.rb | 13 ------------- 2 files changed, 10 insertions(+), 13 deletions(-) delete mode 100644 config/initializers/cache_store.rb diff --git a/config/application.rb b/config/application.rb index fb75817e8..d1f53ceb0 100644 --- a/config/application.rb +++ b/config/application.rb @@ -28,6 +28,16 @@ class Application < Rails::Application config.i18n.default_locale = :nl config.i18n.fallbacks = [:nl] + if ENV['REDIS_HOST'].present? + cable_url = config_for(:cable)['url'] + config.cache_store :redis_cache_store, { + url: cable_url, + pool: { size: ENV.fetch('RAILS_MAX_THREADS', 5).to_i, timeout: 5 } + } + else + config.cache_store :memory_store + end + config.active_job.queue_adapter = :sidekiq config.exceptions_app = routes diff --git a/config/initializers/cache_store.rb b/config/initializers/cache_store.rb deleted file mode 100644 index 03e58f675..000000000 --- a/config/initializers/cache_store.rb +++ /dev/null @@ -1,13 +0,0 @@ -# config/initializers/cache_store.rb - -cache_config = if ENV['REDIS_HOST'].present? - redis_password = ENV['REDIS_PASSWORD'].present? ? ":#{ENV['REDIS_PASSWORD']}@" : ':' - redis_url = "redis://#{redis_password}#{ENV['REDIS_HOST']}:#{ENV.fetch('REDIS_PORT', 6379)}/1" - [:redis_cache_store, { - url: redis_url, - pool: { size: ENV.fetch('RAILS_MAX_THREADS', 5).to_i, timeout: 5 } - }] - else - [:memory_store] - end -Rails.application.config.cache_store(*cache_config) From 5513e8f3a407cbae14672e8a010b08d898c2bfac Mon Sep 17 00:00:00 2001 From: Lodewiges Date: Mon, 12 Jan 2026 02:34:50 +0100 Subject: [PATCH 7/7] use + teken --- config/application.rb | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/config/application.rb b/config/application.rb index d1f53ceb0..04f70d2f0 100644 --- a/config/application.rb +++ b/config/application.rb @@ -28,15 +28,15 @@ class Application < Rails::Application config.i18n.default_locale = :nl config.i18n.fallbacks = [:nl] - if ENV['REDIS_HOST'].present? - cable_url = config_for(:cable)['url'] - config.cache_store :redis_cache_store, { - url: cable_url, - pool: { size: ENV.fetch('RAILS_MAX_THREADS', 5).to_i, timeout: 5 } - } - else - config.cache_store :memory_store - end + config.cache_store = if ENV['REDIS_HOST'].present? + cable_url = config_for(:cable)['url'] + [:redis_cache_store, { + url: cable_url, + pool: { size: ENV.fetch('RAILS_MAX_THREADS', 5).to_i, timeout: 5 } + }] + else + :memory_store + end config.active_job.queue_adapter = :sidekiq