Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .github/workflows/publish-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,9 @@ jobs:
if [ "$GITHUB_REF_NAME" = 'master' ]; then
echo 'tag=latest' >> "$GITHUB_OUTPUT"
else
echo 'tag='"$GITHUB_REF_NAME" >> "$GITHUB_OUTPUT"
# Sanitize branch name for Docker tag (replace / with -)
SANITIZED_TAG=$(echo "$GITHUB_REF_NAME" | sed 's/\//-/g')
echo 'tag='"$SANITIZED_TAG" >> "$GITHUB_OUTPUT"
fi

if [ "$GITHUB_REF_NAME" = 'staging' ] || [ "$GITHUB_REF_NAME" = 'master' ]; then
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ COPY . /app/

# Precompile assets after copying app because whole Rails pipeline is needed.
RUN if [ "$RAILS_ENV" = 'production' ] || [ "$RAILS_ENV" = 'staging' ] || [ "$RAILS_ENV" = 'luxproduction' ] || [ "$RAILS_ENV" = 'euros' ]; then \
SECRET_KEY_BASE_DUMMY=1 bundle exec rails assets:precompile; \
SECRET_KEY_BASE_DUMMY=1 bundle exec rails assets:precompile --trace; \
else \
echo "Skipping assets:precompile"; \
fi
Expand Down
10 changes: 5 additions & 5 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ source 'https://rubygems.org'

gem 'active_model_otp', '~> 2.3', '>= 2.3.4'
gem 'bcrypt', '~> 3.1.20'
gem 'bootsnap', '~> 1.19.0'
gem 'bootsnap', '~> 1.20.0'
gem 'browser', '~> 6.2.0'
gem 'cssbundling-rails', '~> 1.4', '>= 1.4.3'
gem 'dartsass-rails', '~> 0.5.1'
Expand All @@ -16,7 +16,7 @@ gem 'jquery-rails', '~> 4.6.1'
gem 'jsbundling-rails', '~> 1.3', '>= 1.3.1'
gem 'kaminari', '~> 1.2.2'
gem 'mollie-api-ruby', '~> 4.18.0'
gem 'net-imap', '~> 0.5.12'
gem 'net-imap', '~> 0.6.2'
gem 'net-pop', '~> 0.1.2'
gem 'net-smtp', '~> 0.5.1'
gem 'omniauth', '~> 2.1.4'
Expand All @@ -36,7 +36,7 @@ gem 'rqrcode', '~> 3.1', '>= 3.1.1'
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 'sprockets-rails', '~> 3.5', '>= 3.5.2'
Expand All @@ -52,7 +52,7 @@ group :development, :test do
gem 'brakeman', '~> 7.1.1', require: false
gem 'bullet', '~> 8.1'
gem 'colorize', '~> 1.1.0'
gem 'database_consistency', '~> 2.1.0'
gem 'database_consistency', '~> 2.1.1'
gem 'dotenv-rails', '~> 3.2.0'
gem 'guard-livereload', '~> 2.5.2'
gem 'guard-rspec', '~> 4.7.3', require: false
Expand All @@ -75,7 +75,7 @@ end

group :test do
gem 'rails-controller-testing', '~> 1.0.5'
gem 'rubocop', '~> 1.81.7', require: false
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
Expand Down
46 changes: 23 additions & 23 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ GEM
rouge (>= 1.0.0)
bigdecimal (3.3.1)
bindex (0.8.1)
bootsnap (1.19.0)
bootsnap (1.20.0)
msgpack (~> 1.2)
brakeman (7.1.1)
racc
Expand All @@ -118,16 +118,16 @@ GEM
coderay (1.1.3)
colorize (1.1.0)
concurrent-ruby (1.3.6)
connection_pool (3.0.2)
connection_pool (2.5.5)
crass (1.0.6)
cssbundling-rails (1.4.3)
railties (>= 6.0.0)
dartsass-rails (0.5.1)
railties (>= 6.0.0)
sass-embedded (~> 1.63)
database_consistency (2.1.0)
database_consistency (2.1.1)
activerecord (>= 3.2)
date (3.5.0)
date (3.5.1)
devise (4.9.4)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
Expand Down Expand Up @@ -231,7 +231,7 @@ GEM
thor (>= 0.14, < 2.0)
jsbundling-rails (1.3.1)
railties (>= 6.0.0)
json (2.17.0)
json (2.18.0)
jwt (3.1.2)
base64
kaminari (1.2.2)
Expand Down Expand Up @@ -287,7 +287,7 @@ GEM
nenv (0.3.0)
net-http (0.6.0)
uri
net-imap (0.5.12)
net-imap (0.6.2)
date
net-protocol
net-pop (0.1.2)
Expand Down Expand Up @@ -347,7 +347,7 @@ GEM
pp (0.6.3)
prettyprint
prettyprint (0.2.0)
prism (1.6.0)
prism (1.7.0)
pry (0.15.2)
coderay (~> 1.1)
method_source (~> 1.0)
Expand Down Expand Up @@ -430,7 +430,7 @@ GEM
tsort
redis (5.4.1)
redis-client (>= 0.22.0)
redis-client (0.26.1)
redis-client (0.26.2)
connection_pool
regexp_parser (2.11.3)
reline (0.6.3)
Expand Down Expand Up @@ -472,15 +472,15 @@ GEM
rspec-mocks (~> 3.13)
rspec-support (~> 3.13)
rspec-support (3.13.6)
rubocop (1.81.7)
rubocop (1.82.1)
json (~> 2.3)
language_server-protocol (~> 3.17.0.2)
lint_roller (~> 1.1.0)
parallel (~> 1.10)
parser (>= 3.3.0.2)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 2.9.3, < 3.0)
rubocop-ast (>= 1.47.1, < 2.0)
rubocop-ast (>= 1.48.0, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 4.0)
rubocop-ast (1.48.0)
Expand Down Expand Up @@ -522,12 +522,12 @@ 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)
Expand Down Expand Up @@ -570,7 +570,7 @@ GEM
thor (1.4.0)
timecop (0.9.10)
timeliness (0.5.3)
timeout (0.4.4)
timeout (0.6.0)
tsort (0.2.0)
turbo-rails (2.0.20)
actionpack (>= 7.1.0)
Expand All @@ -581,7 +581,7 @@ GEM
execjs (>= 0.3.0, < 3)
unicode-display_width (3.2.0)
unicode-emoji (~> 4.1)
unicode-emoji (4.1.0)
unicode-emoji (4.2.0)
uniform_notifier (1.18.0)
uri (1.0.4)
useragent (0.16.11)
Expand Down Expand Up @@ -614,15 +614,15 @@ DEPENDENCIES
awesome_print (~> 1.9.2)
bcrypt (~> 3.1.20)
better_errors (~> 2.10.1)
bootsnap (~> 1.19.0)
bootsnap (~> 1.20.0)
brakeman (~> 7.1.1)
browser (~> 6.2.0)
bullet (~> 8.1)
capistrano-sidekiq (~> 3.2.0)
colorize (~> 1.1.0)
cssbundling-rails (~> 1.4, >= 1.4.3)
dartsass-rails (~> 0.5.1)
database_consistency (~> 2.1.0)
database_consistency (~> 2.1.1)
devise (~> 4.9.4)
devise-i18n (~> 1.15.0)
dotenv-rails (~> 3.2.0)
Expand All @@ -639,7 +639,7 @@ DEPENDENCIES
listen (~> 3.9.0)
mina (~> 1.2.5)
mollie-api-ruby (~> 4.18.0)
net-imap (~> 0.5.12)
net-imap (~> 0.6.2)
net-pop (~> 0.1.2)
net-smtp (~> 0.5.1)
omniauth (~> 2.1.4)
Expand All @@ -662,7 +662,7 @@ DEPENDENCIES
rest-client (~> 2.1.0)
rqrcode (~> 3.1, >= 3.1.1)
rspec-rails (~> 8.0.2)
rubocop (~> 1.81.7)
rubocop (~> 1.82.1)
rubocop-factory_bot (~> 2.28.0)
rubocop-performance (~> 1.26, >= 1.26.1)
rubocop-rails (~> 2.34, >= 2.34.2)
Expand All @@ -671,7 +671,7 @@ DEPENDENCIES
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)
simplecov (~> 0.22.0)
Expand Down
3 changes: 3 additions & 0 deletions config/application.rb
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@
config.i18n.default_locale = :nl
config.i18n.fallbacks = [:nl]

# Redis cache store with connection_pool 3.x compatibility
# Use nested pool configuration for proper initialization
redis_cache_url = Rails.application.config_for(:cable)['url']

Check warning on line 33 in config/application.rb

View workflow job for this annotation

GitHub Actions / Lint

[Correctable] Lint/UselessAssignment: Useless assignment to variable - redis_cache_url. (https://rubystyle.guide#underscore-unused-vars)
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 }
Expand Down
Loading