Skip to content

Commit 383f2fb

Browse files
Merge branch 'main' into dependabot/bundler/ruby-lsp-0.21.3
2 parents 976448f + 4b08eda commit 383f2fb

File tree

3 files changed

+29
-28
lines changed

3 files changed

+29
-28
lines changed

.github/dependabot.yml

+19-4
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,6 @@ updates:
1212
# Dependabot creates groups in the order they appear in this config.
1313
# If a dependency update could belong to more than one group,
1414
# it is only assigned to the first group it matches with.
15-
linters:
16-
patterns:
17-
- erb_lint
18-
- rubocop*
1915
aws:
2016
patterns:
2117
- aws-eventstream
@@ -24,3 +20,22 @@ updates:
2420
- aws-sdk-kms
2521
- aws-sdk-s3
2622
- aws-sigv4
23+
linters:
24+
patterns:
25+
- erb_lint
26+
- rubocop*
27+
rails:
28+
patterns:
29+
- rails
30+
- railties
31+
- actioncable
32+
- actionmailbox
33+
- actionmailer
34+
- actionpack
35+
- actiontext
36+
- actionview
37+
- activejob
38+
- activemodel
39+
- activerecord
40+
- activestorage
41+
- activesupport

.github/workflows/auto-merge.yml

-14
This file was deleted.

Gemfile.lock

+10-10
Original file line numberDiff line numberDiff line change
@@ -79,16 +79,16 @@ GEM
7979
execjs (~> 2)
8080
awesome_print (1.9.2)
8181
aws-eventstream (1.3.0)
82-
aws-partitions (1.1001.0)
83-
aws-sdk-core (3.211.0)
82+
aws-partitions (1.1002.0)
83+
aws-sdk-core (3.212.0)
8484
aws-eventstream (~> 1, >= 1.3.0)
8585
aws-partitions (~> 1, >= 1.992.0)
8686
aws-sigv4 (~> 1.9)
8787
jmespath (~> 1, >= 1.6.1)
8888
aws-sdk-kms (1.95.0)
8989
aws-sdk-core (~> 3, >= 3.210.0)
9090
aws-sigv4 (~> 1.5)
91-
aws-sdk-s3 (1.169.0)
91+
aws-sdk-s3 (1.170.0)
9292
aws-sdk-core (~> 3, >= 3.210.0)
9393
aws-sdk-kms (~> 1)
9494
aws-sigv4 (~> 1.5)
@@ -285,7 +285,7 @@ GEM
285285
rexml (>= 3.3.9)
286286
pandoc-ruby (2.1.10)
287287
parallel (1.26.3)
288-
parser (3.3.5.1)
288+
parser (3.3.6.0)
289289
ast (~> 2.4.1)
290290
racc
291291
pg (1.5.9)
@@ -297,7 +297,7 @@ GEM
297297
pry-byebug (3.10.1)
298298
byebug (~> 11.0)
299299
pry (>= 0.13, < 0.15)
300-
psych (5.1.2)
300+
psych (5.2.0)
301301
stringio
302302
public_suffix (6.0.1)
303303
puma (6.4.3)
@@ -408,7 +408,7 @@ GEM
408408
rubocop-ast (>= 1.32.2, < 2.0)
409409
ruby-progressbar (~> 1.7)
410410
unicode-display_width (>= 2.4.0, < 3.0)
411-
rubocop-ast (1.33.1)
411+
rubocop-ast (1.34.1)
412412
parser (>= 3.3.1.0)
413413
rubocop-capybara (2.21.0)
414414
rubocop (~> 1.41)
@@ -460,7 +460,7 @@ GEM
460460
websocket (~> 1.0)
461461
sexp_processor (4.17.2)
462462
shellany (0.0.1)
463-
sidekiq (7.3.4)
463+
sidekiq (7.3.5)
464464
connection_pool (>= 2.3.0)
465465
logger
466466
rack (>= 2.2.4)
@@ -474,7 +474,7 @@ GEM
474474
sitemap_generator (6.3.0)
475475
builder (~> 3.0)
476476
smart_properties (1.17.0)
477-
sorbet-runtime (0.5.11641)
477+
sorbet-runtime (0.5.11642)
478478
sprockets (4.2.1)
479479
concurrent-ruby (~> 1.0)
480480
rack (>= 2.2.4, < 4)
@@ -489,11 +489,11 @@ GEM
489489
stimulus-rails (1.3.4)
490490
railties (>= 6.0.0)
491491
stringex (2.8.6)
492-
stringio (3.1.1)
492+
stringio (3.1.2)
493493
stripe (8.7.0)
494494
thor (1.3.2)
495495
tilt (2.4.0)
496-
timeout (0.4.1)
496+
timeout (0.4.2)
497497
tzinfo (2.0.6)
498498
concurrent-ruby (~> 1.0)
499499
uglifier (4.2.1)

0 commit comments

Comments
 (0)