Skip to content

Commit 6969cf6

Browse files
authored
Merge branch 'Shopify:main' into main
2 parents f119217 + c5e1c24 commit 6969cf6

77 files changed

Lines changed: 2373 additions & 1696 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/ci.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ jobs:
1414
runs-on: ubuntu-latest
1515
name: Linters
1616
steps:
17-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
17+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
1818
- name: Set up Ruby
19-
uses: ruby/setup-ruby@a4effe49ee8ee5b8b5091268c473a4628afb5651 # v1.245.0
19+
uses: ruby/setup-ruby@efbf473cab83af4468e8606cc33eca9281bb213f # v1.256.0
2020
with:
2121
bundler-cache: true
2222
rubygems: 3.6.2
@@ -56,7 +56,7 @@ jobs:
5656
env:
5757
RAILS_VERSION: ${{ matrix.rails }}
5858
steps:
59-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
59+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
6060
- name: Install protobuf
6161
run: |
6262
curl -OL https://github.com/google/protobuf/releases/download/v25.3/protoc-25.3-linux-x86_64.zip
@@ -67,7 +67,7 @@ jobs:
6767
if: ${{ matrix.ruby == 'head' || matrix.rails != 'current' }}
6868
run: "rm -f Gemfile.lock"
6969
- name: Set up Ruby
70-
uses: ruby/setup-ruby@a4effe49ee8ee5b8b5091268c473a4628afb5651 # v1.245.0
70+
uses: ruby/setup-ruby@efbf473cab83af4468e8606cc33eca9281bb213f # v1.256.0
7171
with:
7272
ruby-version: ${{ matrix.ruby }}
7373
bundler-cache: true

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111

1212
steps:
13-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
13+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
1414
name: Checkout
1515

1616
- name: Create release

‎.github/workflows/require_label.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
env:
1111
GH_TOKEN: ${{ github.token }}
1212
steps:
13-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
13+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
1414
- name: Check for Pull Request Labels
1515
shell: bash
1616
run: |

‎Gemfile.lock‎

Lines changed: 88 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -18,81 +18,81 @@ GEM
1818
specs:
1919
aasm (5.5.1)
2020
concurrent-ruby (~> 1.0)
21-
actioncable (7.1.5.1)
22-
actionpack (= 7.1.5.1)
23-
activesupport (= 7.1.5.1)
21+
actioncable (7.1.5.2)
22+
actionpack (= 7.1.5.2)
23+
activesupport (= 7.1.5.2)
2424
nio4r (~> 2.0)
2525
websocket-driver (>= 0.6.1)
2626
zeitwerk (~> 2.6)
27-
actionmailbox (7.1.5.1)
28-
actionpack (= 7.1.5.1)
29-
activejob (= 7.1.5.1)
30-
activerecord (= 7.1.5.1)
31-
activestorage (= 7.1.5.1)
32-
activesupport (= 7.1.5.1)
27+
actionmailbox (7.1.5.2)
28+
actionpack (= 7.1.5.2)
29+
activejob (= 7.1.5.2)
30+
activerecord (= 7.1.5.2)
31+
activestorage (= 7.1.5.2)
32+
activesupport (= 7.1.5.2)
3333
mail (>= 2.7.1)
3434
net-imap
3535
net-pop
3636
net-smtp
37-
actionmailer (7.1.5.1)
38-
actionpack (= 7.1.5.1)
39-
actionview (= 7.1.5.1)
40-
activejob (= 7.1.5.1)
41-
activesupport (= 7.1.5.1)
37+
actionmailer (7.1.5.2)
38+
actionpack (= 7.1.5.2)
39+
actionview (= 7.1.5.2)
40+
activejob (= 7.1.5.2)
41+
activesupport (= 7.1.5.2)
4242
mail (~> 2.5, >= 2.5.4)
4343
net-imap
4444
net-pop
4545
net-smtp
4646
rails-dom-testing (~> 2.2)
47-
actionpack (7.1.5.1)
48-
actionview (= 7.1.5.1)
49-
activesupport (= 7.1.5.1)
47+
actionpack (7.1.5.2)
48+
actionview (= 7.1.5.2)
49+
activesupport (= 7.1.5.2)
5050
nokogiri (>= 1.8.5)
5151
racc
5252
rack (>= 2.2.4)
5353
rack-session (>= 1.0.1)
5454
rack-test (>= 0.6.3)
5555
rails-dom-testing (~> 2.2)
5656
rails-html-sanitizer (~> 1.6)
57-
actiontext (7.1.5.1)
58-
actionpack (= 7.1.5.1)
59-
activerecord (= 7.1.5.1)
60-
activestorage (= 7.1.5.1)
61-
activesupport (= 7.1.5.1)
57+
actiontext (7.1.5.2)
58+
actionpack (= 7.1.5.2)
59+
activerecord (= 7.1.5.2)
60+
activestorage (= 7.1.5.2)
61+
activesupport (= 7.1.5.2)
6262
globalid (>= 0.6.0)
6363
nokogiri (>= 1.8.5)
64-
actionview (7.1.5.1)
65-
activesupport (= 7.1.5.1)
64+
actionview (7.1.5.2)
65+
activesupport (= 7.1.5.2)
6666
builder (~> 3.1)
6767
erubi (~> 1.11)
6868
rails-dom-testing (~> 2.2)
6969
rails-html-sanitizer (~> 1.6)
70-
activejob (7.1.5.1)
71-
activesupport (= 7.1.5.1)
70+
activejob (7.1.5.2)
71+
activesupport (= 7.1.5.2)
7272
globalid (>= 0.3.6)
73-
activemodel (7.1.5.1)
74-
activesupport (= 7.1.5.1)
73+
activemodel (7.1.5.2)
74+
activesupport (= 7.1.5.2)
7575
activemodel-serializers-xml (1.0.3)
7676
activemodel (>= 5.0.0.a)
7777
activesupport (>= 5.0.0.a)
7878
builder (~> 3.1)
79-
activerecord (7.1.5.1)
80-
activemodel (= 7.1.5.1)
81-
activesupport (= 7.1.5.1)
79+
activerecord (7.1.5.2)
80+
activemodel (= 7.1.5.2)
81+
activesupport (= 7.1.5.2)
8282
timeout (>= 0.4.0)
8383
activerecord-typedstore (1.6.0)
8484
activerecord (>= 6.1)
8585
activeresource (6.1.4)
8686
activemodel (>= 6.0)
8787
activemodel-serializers-xml (~> 1.0)
8888
activesupport (>= 6.0)
89-
activestorage (7.1.5.1)
90-
actionpack (= 7.1.5.1)
91-
activejob (= 7.1.5.1)
92-
activerecord (= 7.1.5.1)
93-
activesupport (= 7.1.5.1)
89+
activestorage (7.1.5.2)
90+
actionpack (= 7.1.5.2)
91+
activejob (= 7.1.5.2)
92+
activerecord (= 7.1.5.2)
93+
activesupport (= 7.1.5.2)
9494
marcel (~> 1.0)
95-
activesupport (7.1.5.1)
95+
activesupport (7.1.5.2)
9696
base64
9797
benchmark (>= 0.3)
9898
bigdecimal
@@ -118,7 +118,7 @@ GEM
118118
builder (3.3.0)
119119
cityhash (0.9.0)
120120
concurrent-ruby (1.3.5)
121-
config (5.5.2)
121+
config (5.6.1)
122122
deep_merge (~> 1.2, >= 1.2.1)
123123
ostruct
124124
connection_pool (2.5.3)
@@ -131,7 +131,7 @@ GEM
131131
irb (~> 1.10)
132132
reline (>= 0.3.8)
133133
deep_merge (1.2.2)
134-
drb (2.2.1)
134+
drb (2.2.3)
135135
erb (5.0.1)
136136
erubi (1.13.1)
137137
faraday (2.9.0)
@@ -146,25 +146,25 @@ GEM
146146
activemodel
147147
globalid (1.2.1)
148148
activesupport (>= 6.1)
149-
google-protobuf (4.31.1-aarch64-linux-gnu)
149+
google-protobuf (4.32.0-aarch64-linux-gnu)
150150
bigdecimal
151151
rake (>= 13)
152-
google-protobuf (4.31.1-aarch64-linux-musl)
152+
google-protobuf (4.32.0-aarch64-linux-musl)
153153
bigdecimal
154154
rake (>= 13)
155-
google-protobuf (4.31.1-arm64-darwin)
155+
google-protobuf (4.32.0-arm64-darwin)
156156
bigdecimal
157157
rake (>= 13)
158-
google-protobuf (4.31.1-x86_64-darwin)
158+
google-protobuf (4.32.0-x86_64-darwin)
159159
bigdecimal
160160
rake (>= 13)
161-
google-protobuf (4.31.1-x86_64-linux-gnu)
161+
google-protobuf (4.32.0-x86_64-linux-gnu)
162162
bigdecimal
163163
rake (>= 13)
164-
google-protobuf (4.31.1-x86_64-linux-musl)
164+
google-protobuf (4.32.0-x86_64-linux-musl)
165165
bigdecimal
166166
rake (>= 13)
167-
graphql (2.5.10)
167+
graphql (2.5.11)
168168
base64
169169
fiber-storage
170170
logger
@@ -179,7 +179,7 @@ GEM
179179
pp (>= 0.6.0)
180180
rdoc (>= 4.0.0)
181181
reline (>= 0.4.2)
182-
json (2.12.2)
182+
json (2.13.2)
183183
json_api_client (1.23.0)
184184
activemodel (>= 6.0.0)
185185
activesupport (>= 6.0.0)
@@ -228,19 +228,19 @@ GEM
228228
net-protocol
229229
netrc (0.11.0)
230230
nio4r (2.7.4)
231-
nokogiri (1.18.8-aarch64-linux-gnu)
231+
nokogiri (1.18.9-aarch64-linux-gnu)
232232
racc (~> 1.4)
233-
nokogiri (1.18.8-aarch64-linux-musl)
233+
nokogiri (1.18.9-aarch64-linux-musl)
234234
racc (~> 1.4)
235-
nokogiri (1.18.8-arm64-darwin)
235+
nokogiri (1.18.9-arm64-darwin)
236236
racc (~> 1.4)
237-
nokogiri (1.18.8-x86_64-darwin)
237+
nokogiri (1.18.9-x86_64-darwin)
238238
racc (~> 1.4)
239-
nokogiri (1.18.8-x86_64-linux-gnu)
239+
nokogiri (1.18.9-x86_64-linux-gnu)
240240
racc (~> 1.4)
241-
nokogiri (1.18.8-x86_64-linux-musl)
241+
nokogiri (1.18.9-x86_64-linux-musl)
242242
racc (~> 1.4)
243-
ostruct (0.6.0)
243+
ostruct (0.6.2)
244244
parallel (1.27.0)
245245
parser (3.3.8.0)
246246
ast (~> 2.4.1)
@@ -254,38 +254,38 @@ GEM
254254
stringio
255255
public_suffix (6.0.1)
256256
racc (1.8.1)
257-
rack (3.1.16)
257+
rack (3.2.0)
258258
rack-session (2.1.1)
259259
base64 (>= 0.1.0)
260260
rack (>= 3.0.0)
261261
rack-test (2.1.0)
262262
rack (>= 1.3)
263263
rackup (2.2.0)
264264
rack (>= 3)
265-
rails (7.1.5.1)
266-
actioncable (= 7.1.5.1)
267-
actionmailbox (= 7.1.5.1)
268-
actionmailer (= 7.1.5.1)
269-
actionpack (= 7.1.5.1)
270-
actiontext (= 7.1.5.1)
271-
actionview (= 7.1.5.1)
272-
activejob (= 7.1.5.1)
273-
activemodel (= 7.1.5.1)
274-
activerecord (= 7.1.5.1)
275-
activestorage (= 7.1.5.1)
276-
activesupport (= 7.1.5.1)
265+
rails (7.1.5.2)
266+
actioncable (= 7.1.5.2)
267+
actionmailbox (= 7.1.5.2)
268+
actionmailer (= 7.1.5.2)
269+
actionpack (= 7.1.5.2)
270+
actiontext (= 7.1.5.2)
271+
actionview (= 7.1.5.2)
272+
activejob (= 7.1.5.2)
273+
activemodel (= 7.1.5.2)
274+
activerecord (= 7.1.5.2)
275+
activestorage (= 7.1.5.2)
276+
activesupport (= 7.1.5.2)
277277
bundler (>= 1.15.0)
278-
railties (= 7.1.5.1)
278+
railties (= 7.1.5.2)
279279
rails-dom-testing (2.2.0)
280280
activesupport (>= 5.0.0)
281281
minitest
282282
nokogiri (>= 1.6)
283283
rails-html-sanitizer (1.6.1)
284284
loofah (~> 2.21)
285285
nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
286-
railties (7.1.5.1)
287-
actionpack (= 7.1.5.1)
288-
activesupport (= 7.1.5.1)
286+
railties (7.1.5.2)
287+
actionpack (= 7.1.5.2)
288+
activesupport (= 7.1.5.2)
289289
irb
290290
rackup (>= 1.0.0)
291291
rake (>= 12.2)
@@ -304,7 +304,7 @@ GEM
304304
psych (>= 4.0.0)
305305
redis (5.4.0)
306306
redis-client (>= 0.22.0)
307-
redis-client (0.25.0)
307+
redis-client (0.25.2)
308308
connection_pool
309309
regexp_parser (2.10.0)
310310
reline (0.6.1)
@@ -333,34 +333,33 @@ GEM
333333
rubocop-sorbet (0.10.5)
334334
lint_roller
335335
rubocop (>= 1.75.2)
336-
ruby-lsp (0.24.2)
336+
ruby-lsp (0.26.1)
337337
language_server-protocol (~> 3.17.0)
338338
prism (>= 1.2, < 2.0)
339339
rbs (>= 3, < 5)
340-
sorbet-runtime (>= 0.5.10782)
341-
ruby-lsp-rails (0.4.6)
342-
ruby-lsp (>= 0.24.0, < 0.25.0)
340+
ruby-lsp-rails (0.4.8)
341+
ruby-lsp (>= 0.26.0, < 0.27.0)
343342
ruby-progressbar (1.13.0)
344343
securerandom (0.4.1)
345344
shopify-money (3.2.4)
346345
bigdecimal (>= 3.0)
347-
sidekiq (8.0.4)
346+
sidekiq (8.0.7)
348347
connection_pool (>= 2.5.0)
349348
json (>= 2.9.0)
350349
logger (>= 1.6.2)
351350
rack (>= 3.1.0)
352351
redis-client (>= 0.23.2)
353352
smart_properties (1.17.0)
354-
sorbet (0.5.12219)
355-
sorbet-static (= 0.5.12219)
356-
sorbet-runtime (0.5.12219)
357-
sorbet-static (0.5.12219-aarch64-linux)
358-
sorbet-static (0.5.12219-universal-darwin)
359-
sorbet-static (0.5.12219-x86_64-linux)
360-
sorbet-static-and-runtime (0.5.12219)
361-
sorbet (= 0.5.12219)
362-
sorbet-runtime (= 0.5.12219)
363-
spoom (1.7.4)
353+
sorbet (0.5.12435)
354+
sorbet-static (= 0.5.12435)
355+
sorbet-runtime (0.5.12435)
356+
sorbet-static (0.5.12435-aarch64-linux)
357+
sorbet-static (0.5.12435-universal-darwin)
358+
sorbet-static (0.5.12435-x86_64-linux)
359+
sorbet-static-and-runtime (0.5.12435)
360+
sorbet (= 0.5.12435)
361+
sorbet-runtime (= 0.5.12435)
362+
spoom (1.7.6)
364363
erubi (>= 1.10.0)
365364
prism (>= 0.28.0)
366365
rbi (>= 0.3.3)
@@ -378,9 +377,9 @@ GEM
378377
sqlite3 (2.5.0-x86_64-darwin)
379378
sqlite3 (2.5.0-x86_64-linux-gnu)
380379
sqlite3 (2.5.0-x86_64-linux-musl)
381-
state_machines (0.31.0)
380+
state_machines (0.100.1)
382381
stringio (3.1.7)
383-
thor (1.3.2)
382+
thor (1.4.0)
384383
timeout (0.4.3)
385384
tzinfo (2.0.6)
386385
concurrent-ruby (~> 1.0)

0 commit comments

Comments
 (0)