Skip to content

Commit 3bbffda

Browse files
committed
Merge branch 'master' into dietary-restrictions
2 parents 7815915 + 45fd9d1 commit 3bbffda

File tree

4 files changed

+20
-17
lines changed

4 files changed

+20
-17
lines changed
File renamed without changes.

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# config.yml
2+
3+
blank_issues_enabled: false

Gemfile.lock

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -230,9 +230,9 @@ GEM
230230
pp (>= 0.6.0)
231231
rdoc (>= 4.0.0)
232232
reline (>= 0.4.2)
233-
jbuilder (2.13.0)
234-
actionview (>= 5.0.0)
235-
activesupport (>= 5.0.0)
233+
jbuilder (2.14.1)
234+
actionview (>= 7.0.0)
235+
activesupport (>= 7.0.0)
236236
jmespath (1.6.2)
237237
jquery-rails (4.6.0)
238238
rails-dom-testing (>= 1, < 3)
@@ -415,10 +415,10 @@ GEM
415415
rdoc (6.14.2)
416416
erb
417417
psych (>= 4.0.0)
418-
regexp_parser (2.11.0)
418+
regexp_parser (2.11.2)
419419
reline (0.6.2)
420420
io-console (~> 0.5)
421-
rexml (3.4.1)
421+
rexml (3.4.2)
422422
rolify (6.0.1)
423423
rollbar (3.6.2)
424424
rouge (4.1.3)
@@ -441,7 +441,7 @@ GEM
441441
rspec-mocks (~> 3.13)
442442
rspec-support (~> 3.13)
443443
rspec-support (3.13.2)
444-
rubocop (1.79.1)
444+
rubocop (1.80.1)
445445
json (~> 2.3)
446446
language_server-protocol (~> 3.17.0.2)
447447
lint_roller (~> 1.1.0)
@@ -459,7 +459,7 @@ GEM
459459
lint_roller (~> 1.1)
460460
rubocop (>= 1.75.0, < 2.0)
461461
rubocop-ast (>= 1.38.0, < 2.0)
462-
rubocop-rails (2.32.0)
462+
rubocop-rails (2.33.3)
463463
activesupport (>= 4.2.0)
464464
lint_roller (~> 1.1)
465465
rack (>= 1.1)
@@ -472,7 +472,7 @@ GEM
472472
ruby-vips (2.2.4)
473473
ffi (~> 1.12)
474474
logger
475-
rubyzip (2.4.1)
475+
rubyzip (3.0.2)
476476
sassc (2.4.0)
477477
ffi (~> 1.9)
478478
sassc-rails (2.1.2)
@@ -481,14 +481,14 @@ GEM
481481
sprockets (> 3.0)
482482
sprockets-rails
483483
tilt
484-
securerandom (0.4.1)
485484
scout_apm (5.7.1)
486485
parser
487-
selenium-webdriver (4.34.0)
486+
securerandom (0.4.1)
487+
selenium-webdriver (4.35.0)
488488
base64 (~> 0.2)
489489
logger (~> 1.4)
490490
rexml (~> 3.2, >= 3.2.5)
491-
rubyzip (>= 1.2.2, < 3.0)
491+
rubyzip (>= 1.2.2, < 4.0)
492492
websocket (~> 1.0)
493493
shoulda-matchers (6.5.0)
494494
activesupport (>= 5.2.0)
@@ -500,7 +500,7 @@ GEM
500500
simplecov-html (~> 0.11)
501501
simplecov_json_formatter (~> 0.1)
502502
simplecov-html (0.12.3)
503-
simplecov-lcov (0.8.0)
503+
simplecov-lcov (0.9.0)
504504
simplecov_json_formatter (0.1.4)
505505
slop (3.6.0)
506506
snaky_hash (2.0.1)
@@ -526,14 +526,14 @@ GEM
526526
tilt (2.6.1)
527527
timecop (0.9.10)
528528
timeout (0.4.3)
529-
turbo-rails (2.0.12)
530-
actionpack (>= 6.0.0)
531-
railties (>= 6.0.0)
529+
turbo-rails (2.0.16)
530+
actionpack (>= 7.1.0)
531+
railties (>= 7.1.0)
532532
tzinfo (2.0.6)
533533
concurrent-ruby (~> 1.0)
534534
tzinfo-data (1.2025.2)
535535
tzinfo (>= 1.0.0)
536-
unicode-display_width (3.1.4)
536+
unicode-display_width (3.1.5)
537537
unicode-emoji (~> 4.0, >= 4.0.4)
538538
unicode-emoji (4.0.4)
539539
uniform_notifier (1.17.0)

bin/drspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22

33
set -e
44

5-
docker compose exec web rspec $@
5+
docker compose exec web bundle exec rspec $@

0 commit comments

Comments
 (0)