File tree Expand file tree Collapse file tree 1 file changed +26
-2
lines changed
Expand file tree Collapse file tree 1 file changed +26
-2
lines changed Original file line number Diff line number Diff line change 231231 nokogiri (1.19.2 )
232232 mini_portile2 (~> 2.8.2 )
233233 racc (~> 1.4 )
234+ <<<<<<< HEAD
234235 ostruct (0.6.3 )
235236 parallel (1.28.0 )
237+ =======
238+ notiffany (0.1.3 )
239+ nenv (~> 0.1 )
240+ shellany (~> 0.0 )
241+ parallel (2.0.1 )
242+ >>>>>>> 5e4deda (Update all Bundler dependencies (2026-04-10) (#1405))
236243 parser (3.3.11.1 )
237244 ast (~> 2.4.1 )
238245 racc
309316 erb
310317 psych (>= 4.0.0 )
311318 tsort
319+ <<<<<<< HEAD
312320 readline (0.0.4 )
313321 reline
322+ =======
323+ refract (1.1.0 )
324+ prism
325+ zeitwerk
326+ >>>>>>> 5e4deda (Update all Bundler dependencies (2026-04-10) (#1405))
314327 regexp_parser (2.12.0 )
315328 reline (0.6.3 )
316329 io-console (~> 0.5 )
@@ -338,11 +351,11 @@ GEM
338351 rspec-support (3.13.7 )
339352 rspec_junit_formatter (0.6.0 )
340353 rspec-core (>= 2 , < 4 , != 2.12.0 )
341- rubocop (1.86.0 )
354+ rubocop (1.86.1 )
342355 json (~> 2.3 )
343356 language_server-protocol (~> 3.17.0.2 )
344357 lint_roller (~> 1.1.0 )
345- parallel (~> 1.10 )
358+ parallel (>= 1.10 )
346359 parser (>= 3.3.0.2 )
347360 rainbow (>= 2.2.2 , < 4.0 )
348361 regexp_parser (>= 2.9.3 , < 3.0 )
386399 rb-inotify (~> 0.9 , >= 0.9.7 )
387400 sax-machine (1.3.2 )
388401 securerandom (0.4.1 )
402+ <<<<<<< HEAD
389403 selenium-webdriver (4.10.0 )
404+ =======
405+ selenium-webdriver (4.42.0 )
406+ base64 (~> 0.2 )
407+ logger (~> 1.4 )
408+ >>>>>>> 5e4deda (Update all Bundler dependencies (2026-04-10) (#1405))
390409 rexml (~> 3.2 , >= 3.2.5 )
391410 rubyzip (>= 1.2.2 , < 3.0 )
392411 websocket (~> 1.0 )
399418 stimulus-rails (1.3.4 )
400419 railties (>= 6.0.0 )
401420 stringio (3.2.0 )
421+ <<<<<<< HEAD
402422 stripe (19.0.0 )
403423 bigdecimal
404424 logger
407427 sync (0.5.0 )
408428 term-ansicolor (1.11.3 )
409429 tins (~> 1 )
430+ =======
431+ strong_migrations (2.6.0 )
432+ activerecord (>= 7.2 )
433+ >>>>>>> 5e4deda (Update all Bundler dependencies (2026-04-10) (#1405))
410434 thor (1.5.0 )
411435 thread (0.2.2 )
412436 thread_safe (0.3.6 )
You can’t perform that action at this time.
0 commit comments