Skip to content

Commit 6ebf641

Browse files
authored
Merge branch 'main' into enhancement/accessibility-testing
2 parents 4880a98 + 8c42154 commit 6ebf641

File tree

3 files changed

+48
-46
lines changed

3 files changed

+48
-46
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ gem 'redis', '~> 5.2'
3535
gem 'rswag'
3636

3737
# Sidekiq for background processing
38-
gem 'sidekiq', '~> 7.2.4'
38+
gem 'sidekiq', '~> 7.3.0'
3939

4040
# Error and performance monitoring with Sentry
4141
gem 'sentry-rails'

Gemfile.lock

Lines changed: 46 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -129,19 +129,19 @@ GEM
129129
autoprefixer-rails (10.4.16.0)
130130
execjs (~> 2)
131131
aws-eventstream (1.3.0)
132-
aws-partitions (1.944.0)
133-
aws-sdk-core (3.197.0)
132+
aws-partitions (1.950.0)
133+
aws-sdk-core (3.201.0)
134134
aws-eventstream (~> 1, >= 1.3.0)
135135
aws-partitions (~> 1, >= 1.651.0)
136136
aws-sigv4 (~> 1.8)
137137
jmespath (~> 1, >= 1.6.1)
138-
aws-sdk-kms (1.84.0)
139-
aws-sdk-core (~> 3, >= 3.197.0)
140-
aws-sigv4 (~> 1.1)
141-
aws-sdk-s3 (1.152.3)
142-
aws-sdk-core (~> 3, >= 3.197.0)
138+
aws-sdk-kms (1.88.0)
139+
aws-sdk-core (~> 3, >= 3.201.0)
140+
aws-sigv4 (~> 1.5)
141+
aws-sdk-s3 (1.156.0)
142+
aws-sdk-core (~> 3, >= 3.201.0)
143143
aws-sdk-kms (~> 1)
144-
aws-sigv4 (~> 1.8)
144+
aws-sigv4 (~> 1.5)
145145
aws-sigv4 (1.8.0)
146146
aws-eventstream (~> 1, >= 1.0.2)
147147
base64 (0.2.0)
@@ -193,7 +193,7 @@ GEM
193193
tilt
194194
database_cleaner (2.0.2)
195195
database_cleaner-active_record (>= 2, < 3)
196-
database_cleaner-active_record (2.1.0)
196+
database_cleaner-active_record (2.2.0)
197197
activerecord (>= 5.a)
198198
database_cleaner-core (~> 2.0.0)
199199
database_cleaner-core (2.0.1)
@@ -206,9 +206,9 @@ GEM
206206
railties (>= 4.1.0)
207207
responders
208208
warden (~> 1.2.3)
209-
devise-jwt (0.11.0)
209+
devise-jwt (0.12.1)
210210
devise (~> 4.0)
211-
warden-jwt_auth (~> 0.8)
211+
warden-jwt_auth (~> 0.10)
212212
diff-lcs (1.5.1)
213213
disposable (0.6.3)
214214
declarative (>= 0.0.9, < 1.0.0)
@@ -220,24 +220,24 @@ GEM
220220
dry-auto_inject (1.0.1)
221221
dry-core (~> 1.0)
222222
zeitwerk (~> 2.6)
223-
dry-configurable (1.1.0)
223+
dry-configurable (1.2.0)
224224
dry-core (~> 1.0, < 2)
225225
zeitwerk (~> 2.6)
226226
dry-core (1.0.1)
227227
concurrent-ruby (~> 1.0)
228228
zeitwerk (~> 2.6)
229-
erubi (1.12.0)
230-
excon (0.110.0)
229+
erubi (1.13.0)
230+
excon (0.111.0)
231231
execjs (2.9.1)
232232
factory_bot (6.4.5)
233233
activesupport (>= 5.0.0)
234234
factory_bot_rails (6.4.3)
235235
factory_bot (~> 6.4)
236236
railties (>= 5.0.0)
237-
faker (3.4.1)
237+
faker (3.4.2)
238238
i18n (>= 1.8.11, < 2)
239239
ffi (1.17.0-x86_64-linux-gnu)
240-
fog-aws (3.22.0)
240+
fog-aws (3.24.0)
241241
fog-core (~> 2.1)
242242
fog-json (~> 1.1)
243243
fog-xml (~> 0.1)
@@ -281,7 +281,7 @@ GEM
281281
activesupport (>= 6.0.0)
282282
railties (>= 6.0.0)
283283
io-console (0.7.2)
284-
irb (1.13.1)
284+
irb (1.14.0)
285285
rdoc (>= 4.0.0)
286286
reline (>= 0.4.2)
287287
jmespath (1.6.2)
@@ -292,12 +292,13 @@ GEM
292292
activerecord (>= 4.1)
293293
concurrent-ruby
294294
railties (>= 4.1)
295-
jwt (2.8.1)
295+
jwt (2.8.2)
296296
base64
297297
language_server-protocol (3.17.0.3)
298298
listen (3.9.0)
299299
rb-fsevent (~> 0.10, >= 0.10.3)
300300
rb-inotify (~> 0.9, >= 0.9.10)
301+
logger (1.6.0)
301302
loofah (2.22.0)
302303
crass (~> 1.0.2)
303304
nokogiri (>= 1.12.0)
@@ -309,12 +310,12 @@ GEM
309310
marcel (1.0.4)
310311
matrix (0.4.2)
311312
method_source (1.1.0)
312-
mime-types (3.5.1)
313+
mime-types (3.5.2)
313314
mime-types-data (~> 3.2015)
314-
mime-types-data (3.2023.1003)
315+
mime-types-data (3.2024.0702)
315316
mini_magick (4.12.0)
316317
mini_mime (1.1.5)
317-
minitest (5.23.1)
318+
minitest (5.24.1)
318319
mobility (1.2.9)
319320
i18n (>= 0.6.10, < 2)
320321
request_store (~> 1.0)
@@ -335,12 +336,12 @@ GEM
335336
net-protocol
336337
netrc (0.11.0)
337338
nio4r (2.7.3)
338-
nokogiri (1.16.5-x86_64-linux)
339+
nokogiri (1.16.6-x86_64-linux)
339340
racc (~> 1.4)
340341
optimist (3.1.0)
341342
orm_adapter (0.5.0)
342343
parallel (1.25.1)
343-
parser (3.3.2.0)
344+
parser (3.3.4.0)
344345
ast (~> 2.4.1)
345346
racc
346347
pg (1.5.6)
@@ -356,7 +357,7 @@ GEM
356357
pundit (2.3.2)
357358
activesupport (>= 3.0.0)
358359
racc (1.8.0)
359-
rack (3.1.2)
360+
rack (3.1.7)
360361
rack-cors (2.0.2)
361362
rack (>= 2.0.0)
362363
rack-mini-profiler (3.3.1)
@@ -424,7 +425,7 @@ GEM
424425
activemodel (>= 5.0)
425426
reform (>= 2.3.1, < 3.0.0)
426427
regexp_parser (2.9.2)
427-
reline (0.5.8)
428+
reline (0.5.9)
428429
io-console (~> 0.5)
429430
representable (3.2.0)
430431
declarative (< 0.1.0)
@@ -440,7 +441,7 @@ GEM
440441
http-cookie (>= 1.0.2, < 2.0)
441442
mime-types (>= 1.16, < 4.0)
442443
netrc (~> 0.8)
443-
rexml (3.3.0)
444+
rexml (3.3.2)
444445
strscan
445446
rgeo (3.0.1)
446447
rgeo-activerecord (7.0.1)
@@ -453,13 +454,13 @@ GEM
453454
rspec-mocks (~> 3.13.0)
454455
rspec-core (3.13.0)
455456
rspec-support (~> 3.13.0)
456-
rspec-expectations (3.13.0)
457+
rspec-expectations (3.13.1)
457458
diff-lcs (>= 1.2.0, < 2.0)
458459
rspec-support (~> 3.13.0)
459-
rspec-mocks (3.13.0)
460+
rspec-mocks (3.13.1)
460461
diff-lcs (>= 1.2.0, < 2.0)
461462
rspec-support (~> 3.13.0)
462-
rspec-rails (6.1.2)
463+
rspec-rails (6.1.3)
463464
actionpack (>= 6.1)
464465
activesupport (>= 6.1)
465466
railties (>= 6.1)
@@ -483,20 +484,20 @@ GEM
483484
rswag-ui (2.13.0)
484485
actionpack (>= 3.1, < 7.2)
485486
railties (>= 3.1, < 7.2)
486-
rubocop (1.64.1)
487+
rubocop (1.65.0)
487488
json (~> 2.3)
488489
language_server-protocol (>= 3.17.0)
489490
parallel (~> 1.10)
490491
parser (>= 3.3.0.2)
491492
rainbow (>= 2.2.2, < 4.0)
492-
regexp_parser (>= 1.8, < 3.0)
493+
regexp_parser (>= 2.4, < 3.0)
493494
rexml (>= 3.2.5, < 4.0)
494495
rubocop-ast (>= 1.31.1, < 2.0)
495496
ruby-progressbar (~> 1.7)
496497
unicode-display_width (>= 2.4.0, < 3.0)
497498
rubocop-ast (1.31.3)
498499
parser (>= 3.3.1.0)
499-
rubocop-rspec (3.0.1)
500+
rubocop-rspec (3.0.3)
500501
rubocop (~> 1.61)
501502
ruby-progressbar (1.13.0)
502503
ruby-vips (2.2.1)
@@ -508,26 +509,28 @@ GEM
508509
ffi (~> 1.9)
509510
sassc-embedded (1.76.0)
510511
sass-embedded (~> 1.76)
511-
selenium-webdriver (4.21.1)
512+
selenium-webdriver (4.22.0)
512513
base64 (~> 0.2)
514+
logger (~> 1.4)
513515
rexml (~> 3.2, >= 3.2.5)
514516
rubyzip (>= 1.2.2, < 3.0)
515517
websocket (~> 1.0)
516-
sentry-rails (5.17.3)
518+
sentry-rails (5.18.1)
517519
railties (>= 5.0)
518-
sentry-ruby (~> 5.17.3)
519-
sentry-ruby (5.17.3)
520+
sentry-ruby (~> 5.18.1)
521+
sentry-ruby (5.18.1)
520522
bigdecimal
521523
concurrent-ruby (~> 1.0, >= 1.0.2)
522524
shoulda-callback-matchers (1.1.4)
523525
activesupport (>= 3)
524526
shoulda-matchers (6.2.0)
525527
activesupport (>= 5.2.0)
526-
sidekiq (7.2.4)
528+
sidekiq (7.3.0)
527529
concurrent-ruby (< 2)
528530
connection_pool (>= 2.3.0)
531+
logger
529532
rack (>= 2.2.4)
530-
redis-client (>= 0.19.0)
533+
redis-client (>= 0.22.2)
531534
simplecov (0.22.0)
532535
docile (~> 1.1)
533536
simplecov-html (~> 0.11)
@@ -548,7 +551,7 @@ GEM
548551
stackprof (0.2.26)
549552
stimulus-rails (1.3.3)
550553
railties (>= 6.0.0)
551-
stringio (3.1.0)
554+
stringio (3.1.1)
552555
strscan (3.1.0)
553556
sync (0.5.0)
554557
term-ansicolor (1.7.1)
@@ -559,7 +562,7 @@ GEM
559562
tins (1.32.1)
560563
sync
561564
trailblazer-option (0.1.2)
562-
turbo-rails (2.0.5)
565+
turbo-rails (2.0.6)
563566
actionpack (>= 6.0.0)
564567
activejob (>= 6.0.0)
565568
railties (>= 6.0.0)
@@ -574,7 +577,7 @@ GEM
574577
unicode-display_width (2.5.0)
575578
warden (1.2.9)
576579
rack (>= 2.0.9)
577-
warden-jwt_auth (0.8.0)
580+
warden-jwt_auth (0.10.0)
578581
dry-auto_inject (>= 0.8, < 2)
579582
dry-configurable (>= 0.13, < 2)
580583
jwt (~> 2.1)
@@ -595,7 +598,7 @@ GEM
595598
websocket-extensions (0.1.5)
596599
xpath (3.2.0)
597600
nokogiri (~> 1.8)
598-
zeitwerk (2.6.15)
601+
zeitwerk (2.6.16)
599602

600603
PLATFORMS
601604
x86_64-linux
@@ -640,7 +643,7 @@ DEPENDENCIES
640643
sentry-ruby
641644
shoulda-callback-matchers
642645
shoulda-matchers
643-
sidekiq (~> 7.2.4)
646+
sidekiq (~> 7.3.0)
644647
simplecov
645648
spring
646649
spring-watcher-listen (~> 2.1.0)

lib/better_together/engine.rb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,7 @@ class Engine < ::Rails::Engine
4242

4343
default_url_options = {
4444
host: ENV.fetch('APP_HOST', 'localhost:3000'),
45-
protocol: ENV.fetch('APP_PROTOCOL', 'http'),
46-
locale: ENV.fetch('APP_LOCALE', I18n.locale)
45+
protocol: ENV.fetch('APP_PROTOCOL', 'http')
4746
}
4847

4948
routes.default_url_options =

0 commit comments

Comments
 (0)