Skip to content

Commit bc727a0

Browse files
authored
Merge pull request rails#52042 from Shopify/fix-sprockets-rails-3.5
Unpin sprockets-rails
2 parents a24edef + a56f5e5 commit bc727a0

File tree

2 files changed

+16
-17
lines changed

2 files changed

+16
-17
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ gem "minitest", ">= 5.15.0"
88
# We need a newish Rake since Active Job sets its test tasks' descriptions.
99
gem "rake", ">= 13"
1010

11-
gem "sprockets-rails", ">= 2.0.0", "< 3.5.0", require: false
11+
gem "sprockets-rails", ">= 2.0.0", require: false
1212
gem "propshaft", ">= 0.1.7"
1313
gem "capybara", ">= 3.39"
1414
gem "selenium-webdriver", ">= 4.20.0"

Gemfile.lock

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -161,13 +161,13 @@ GEM
161161
bcrypt (3.1.20)
162162
bcrypt_pbkdf (1.1.0)
163163
beaneater (1.1.3)
164-
bigdecimal (3.1.5)
164+
bigdecimal (3.1.8)
165165
bindex (0.8.1)
166166
bootsnap (1.17.0)
167167
msgpack (~> 1.2)
168168
brakeman (6.1.1)
169169
racc
170-
builder (3.2.4)
170+
builder (3.3.0)
171171
bunny (2.22.0)
172172
amq-protocol (~> 2.3, >= 2.3.1)
173173
sorted_set (~> 1, >= 1.0.2)
@@ -208,8 +208,7 @@ GEM
208208
digest-crc (0.6.5)
209209
rake (>= 12.0.0, < 14.0.0)
210210
dotenv (2.8.1)
211-
drb (2.2.0)
212-
ruby2_keywords
211+
drb (2.2.1)
213212
ed25519 (1.3.0)
214213
erubi (1.12.0)
215214
et-orbi (1.2.7)
@@ -283,7 +282,7 @@ GEM
283282
os (>= 0.9, < 2.0)
284283
signet (>= 0.16, < 2.a)
285284
hashdiff (1.1.0)
286-
i18n (1.14.1)
285+
i18n (1.14.5)
287286
concurrent-ruby (~> 1.0)
288287
image_processing (1.12.2)
289288
mini_magick (>= 4.9.5, < 5)
@@ -345,8 +344,8 @@ GEM
345344
mixlib-shellout
346345
mini_magick (4.12.0)
347346
mini_mime (1.1.5)
348-
mini_portile2 (2.8.6)
349-
minitest (5.21.1)
347+
mini_portile2 (2.8.7)
348+
minitest (5.23.1)
350349
minitest-bisect (1.7.0)
351350
minitest-server (~> 1.0)
352351
path_expander (~> 1.1)
@@ -384,12 +383,12 @@ GEM
384383
net-protocol
385384
net-ssh (7.2.3)
386385
nio4r (2.7.0)
387-
nokogiri (1.16.0)
386+
nokogiri (1.16.5)
388387
mini_portile2 (~> 2.8.2)
389388
racc (~> 1.4)
390-
nokogiri (1.16.0-x86_64-darwin)
389+
nokogiri (1.16.5-x86_64-darwin)
391390
racc (~> 1.4)
392-
nokogiri (1.16.0-x86_64-linux)
391+
nokogiri (1.16.5-x86_64-linux)
393392
racc (~> 1.4)
394393
os (1.1.4)
395394
parallel (1.24.0)
@@ -413,8 +412,8 @@ GEM
413412
queue_classic (4.0.0)
414413
pg (>= 1.1, < 2.0)
415414
raabro (1.4.0)
416-
racc (1.7.3)
417-
rack (3.0.8)
415+
racc (1.8.0)
416+
rack (3.0.11)
418417
rack-cache (1.15.0)
419418
rack (>= 0.4)
420419
rack-session (2.0.0)
@@ -546,9 +545,9 @@ GEM
546545
sprockets (4.2.1)
547546
concurrent-ruby (~> 1.0)
548547
rack (>= 2.2.4, < 4)
549-
sprockets-rails (3.4.2)
550-
actionpack (>= 5.2)
551-
activesupport (>= 5.2)
548+
sprockets-rails (3.5.1)
549+
actionpack (>= 6.1)
550+
activesupport (>= 6.1)
552551
sprockets (>= 3.0.0)
553552
sqlite3 (2.0.0)
554553
mini_portile2 (~> 2.8.0)
@@ -683,7 +682,7 @@ DEPENDENCIES
683682
selenium-webdriver (>= 4.20.0)
684683
sidekiq
685684
sneakers
686-
sprockets-rails (>= 2.0.0, < 3.5.0)
685+
sprockets-rails (>= 2.0.0)
687686
sqlite3 (>= 1.6.6)
688687
stackprof
689688
stimulus-rails

0 commit comments

Comments
 (0)