Skip to content

Commit b943f9e

Browse files
authored
Merge pull request #61 from wikirate/staging
decko and gem updates
2 parents f0e8d9e + 6d13c84 commit b943f9e

3 files changed

Lines changed: 47 additions & 39 deletions

File tree

Gemfile.lock

Lines changed: 45 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ PATH
77
card-mod-search
88
card-mod-google_analytics (0.2)
99
card
10-
staccato (~> 0.5)
10+
faraday (~> 2.13.0)
1111
card-mod-new_relic (0.3)
1212
card
1313
decko
@@ -188,13 +188,13 @@ PATH
188188
remote: vendor/decko
189189
specs:
190190
card (1.108.1)
191-
actionmailbox (~> 7.1)
192-
actionmailer (~> 7.1)
193-
actionview (~> 7.1)
194-
activejob (~> 7.1)
195-
activerecord (~> 7.1)
191+
actionmailbox (~> 7.2)
192+
actionmailer (~> 7.2)
193+
actionview (~> 7.2)
194+
activejob (~> 7.2)
195+
activerecord (~> 7.2)
196196
activerecord-import (~> 1.1)
197-
activestorage (~> 7.1)
197+
activestorage (~> 7.2)
198198
bootstrap4-kaminari-views (~> 1.0)
199199
cardname (= 0.18.1)
200200
coderay (~> 1.1)
@@ -205,7 +205,7 @@ PATH
205205
haml (~> 5.2)
206206
jwt (~> 2.2)
207207
kaminari (~> 1.2)
208-
railties (~> 7.1)
208+
railties (~> 7.2)
209209
rake (~> 13.0)
210210
sass (~> 3.7.4)
211211
sassc (~> 2.4)
@@ -215,10 +215,10 @@ PATH
215215
uglifier (~> 4.2)
216216
zeitwerk (~> 2.7.2)
217217
cardname (0.18.1)
218-
activesupport (~> 7.1)
218+
activesupport (~> 7.2)
219219
htmlentities (~> 4.3)
220220
decko (0.18.1)
221-
actionpack (~> 7.1)
221+
actionpack (~> 7.2)
222222
card (= 1.108.1)
223223
card-mod-defaults (= 0.18.1)
224224

@@ -315,7 +315,7 @@ GEM
315315
rails (>= 3.1)
316316
break (0.40.0)
317317
builder (3.3.0)
318-
carrierwave (3.1.1)
318+
carrierwave (3.1.2)
319319
activemodel (>= 6.0.0)
320320
activesupport (>= 6.0.0)
321321
addressable (~> 2.6)
@@ -329,9 +329,9 @@ GEM
329329
coffee-script-source (1.12.2)
330330
colorize (1.1.0)
331331
concurrent-ruby (1.3.5)
332-
connection_pool (2.5.0)
332+
connection_pool (2.5.3)
333333
crass (1.0.6)
334-
csv (3.3.3)
334+
csv (3.3.4)
335335
daemons (1.4.1)
336336
dalli (3.2.8)
337337
date (3.4.1)
@@ -353,8 +353,14 @@ GEM
353353
excon (1.2.5)
354354
logger
355355
execjs (2.10.0)
356-
ffi (1.17.1)
357-
fog-aws (3.30.0)
356+
faraday (2.13.1)
357+
faraday-net_http (>= 2.0, < 3.5)
358+
json
359+
logger
360+
faraday-net_http (3.4.0)
361+
net-http (>= 0.5.0)
362+
ffi (1.17.2)
363+
fog-aws (3.31.0)
358364
base64 (~> 0.2.0)
359365
fog-core (~> 2.6)
360366
fog-json (~> 1.1)
@@ -389,11 +395,11 @@ GEM
389395
ruby-vips (>= 2.0.17, < 3)
390396
interception (0.5)
391397
io-console (0.8.0)
392-
irb (1.15.1)
398+
irb (1.15.2)
393399
pp (>= 0.6.0)
394400
rdoc (>= 4.0.0)
395401
reline (>= 0.4.2)
396-
json (2.10.2)
402+
json (2.11.3)
397403
jwt (2.10.1)
398404
base64
399405
kaminari (1.2.2)
@@ -415,7 +421,7 @@ GEM
415421
kramdown (~> 2.0)
416422
language_server-protocol (3.17.0.4)
417423
lint_roller (1.1.0)
418-
logger (1.6.6)
424+
logger (1.7.0)
419425
loofah (2.24.0)
420426
crass (~> 1.0.2)
421427
nokogiri (>= 1.12.0)
@@ -426,10 +432,10 @@ GEM
426432
net-smtp
427433
marcel (1.0.2)
428434
method_source (1.1.0)
429-
mime-types (3.6.2)
435+
mime-types (3.7.0)
430436
logger
431-
mime-types-data (~> 3.2015)
432-
mime-types-data (3.2025.0325)
437+
mime-types-data (~> 3.2025, >= 3.2025.0507)
438+
mime-types-data (3.2025.0507)
433439
mini_magick (4.13.2)
434440
mini_mime (1.1.5)
435441
mini_portile2 (2.8.8)
@@ -438,6 +444,8 @@ GEM
438444
mustermann (3.0.3)
439445
ruby2_keywords (~> 0.0.1)
440446
mysql2 (0.5.6)
447+
net-http (0.6.0)
448+
uri
441449
net-imap (0.3.7)
442450
date
443451
net-protocol
@@ -447,13 +455,13 @@ GEM
447455
timeout
448456
net-smtp (0.5.1)
449457
net-protocol
450-
newrelic_rpm (9.17.0)
458+
newrelic_rpm (9.19.0)
451459
nio4r (2.7.4)
452-
nokogiri (1.18.6)
460+
nokogiri (1.18.8)
453461
mini_portile2 (~> 2.8.2)
454462
racc (~> 1.4)
455-
parallel (1.26.3)
456-
parser (3.3.7.3)
463+
parallel (1.27.0)
464+
parser (3.3.8.0)
457465
ast (~> 2.4.1)
458466
racc
459467
pp (0.6.2)
@@ -471,14 +479,14 @@ GEM
471479
pry-stack_explorer (0.6.1)
472480
binding_of_caller (~> 1.0)
473481
pry (~> 0.13)
474-
psych (5.2.3)
482+
psych (5.2.4)
475483
date
476484
stringio
477-
public_suffix (6.0.1)
485+
public_suffix (6.0.2)
478486
puma (6.6.0)
479487
nio4r (~> 2.0)
480488
racc (1.8.1)
481-
rack (2.2.13)
489+
rack (2.2.14)
482490
rack-protection (3.2.0)
483491
base64 (>= 0.1.0)
484492
rack (~> 2.2, >= 2.2.4)
@@ -525,27 +533,27 @@ GEM
525533
rb-fsevent (0.11.2)
526534
rb-inotify (0.11.1)
527535
ffi (~> 1.0)
528-
rdoc (6.13.0)
536+
rdoc (6.13.1)
529537
psych (>= 4.0.0)
530538
recaptcha (4.13.2)
531539
json
532540
regexp_parser (2.10.0)
533-
reline (0.6.0)
541+
reline (0.6.1)
534542
io-console (~> 0.5)
535543
rexml (3.4.1)
536-
rouge (4.5.1)
537-
rubocop (1.75.0)
544+
rouge (4.5.2)
545+
rubocop (1.75.5)
538546
json (~> 2.3)
539547
language_server-protocol (~> 3.17.0.2)
540548
lint_roller (~> 1.1.0)
541549
parallel (~> 1.10)
542550
parser (>= 3.3.0.2)
543551
rainbow (>= 2.2.2, < 4.0)
544552
regexp_parser (>= 2.9.3, < 3.0)
545-
rubocop-ast (>= 1.43.0, < 2.0)
553+
rubocop-ast (>= 1.44.0, < 2.0)
546554
ruby-progressbar (~> 1.7)
547555
unicode-display_width (>= 2.4.0, < 4.0)
548-
rubocop-ast (1.43.0)
556+
rubocop-ast (1.44.1)
549557
parser (>= 3.3.7.2)
550558
prism (~> 1.4)
551559
ruby-progressbar (1.13.0)
@@ -581,8 +589,7 @@ GEM
581589
activesupport (>= 6.1)
582590
sprockets (>= 3.0.0)
583591
ssrf_filter (1.2.0)
584-
staccato (0.5.3)
585-
stringio (3.1.6)
592+
stringio (3.1.7)
586593
temple (0.10.3)
587594
thor (1.3.2)
588595
tilt (2.6.0)
@@ -597,6 +604,7 @@ GEM
597604
unicode-display_width (3.1.4)
598605
unicode-emoji (~> 4.0, >= 4.0.4)
599606
unicode-emoji (4.0.4)
607+
uri (1.0.3)
600608
useragent (0.16.11)
601609
webrick (1.9.1)
602610
websocket-driver (0.7.7)
@@ -633,4 +641,4 @@ DEPENDENCIES
633641
tzinfo-data
634642

635643
BUNDLED WITH
636-
2.4.18
644+
2.6.8

0 commit comments

Comments
 (0)