Skip to content

Commit 2fcb44b

Browse files
authored
Merge pull request #2467 from Shopify/dependabot/bundler/action_text-trix-2.1.16
Bump action_text-trix from 2.1.15 to 2.1.16
2 parents 80a0d87 + d2bc71c commit 2fcb44b

13 files changed

Lines changed: 885 additions & 566 deletions

Gemfile.lock

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ GEM
1818
specs:
1919
aasm (5.5.2)
2020
concurrent-ruby (~> 1.0)
21-
action_text-trix (2.1.15)
21+
action_text-trix (2.1.16)
2222
railties
2323
actioncable (8.1.1)
2424
actionpack (= 8.1.1)
@@ -111,10 +111,10 @@ GEM
111111
base64 (0.3.0)
112112
bcrypt (3.1.20)
113113
benchmark (0.5.0)
114-
bigdecimal (3.3.1)
114+
bigdecimal (4.0.1)
115115
builder (3.3.0)
116116
cityhash (0.9.0)
117-
concurrent-ruby (1.3.5)
117+
concurrent-ruby (1.3.6)
118118
config (5.6.1)
119119
deep_merge (~> 1.2, >= 1.2.1)
120120
ostruct
@@ -166,7 +166,7 @@ GEM
166166
fiber-storage
167167
logger
168168
hashdiff (1.2.1)
169-
i18n (1.14.7)
169+
i18n (1.14.8)
170170
concurrent-ruby (~> 1.0)
171171
identity_cache (1.6.3)
172172
activerecord (>= 7.0)
@@ -193,7 +193,7 @@ GEM
193193
language_server-protocol (3.17.0.5)
194194
lint_roller (1.1.0)
195195
logger (1.7.0)
196-
loofah (2.23.1)
196+
loofah (2.25.0)
197197
crass (~> 1.0.2)
198198
nokogiri (>= 1.12.0)
199199
mail (2.8.1)
@@ -255,9 +255,9 @@ GEM
255255
rack-session (2.1.1)
256256
base64 (>= 0.1.0)
257257
rack (>= 3.0.0)
258-
rack-test (2.1.0)
258+
rack-test (2.2.0)
259259
rack (>= 1.3)
260-
rackup (2.2.0)
260+
rackup (2.3.1)
261261
rack (>= 3)
262262
rails (8.1.1)
263263
actioncable (= 8.1.1)
@@ -273,11 +273,11 @@ GEM
273273
activesupport (= 8.1.1)
274274
bundler (>= 1.15.0)
275275
railties (= 8.1.1)
276-
rails-dom-testing (2.2.0)
276+
rails-dom-testing (2.3.0)
277277
activesupport (>= 5.0.0)
278278
minitest
279279
nokogiri (>= 1.6)
280-
rails-html-sanitizer (1.6.1)
280+
rails-html-sanitizer (1.6.2)
281281
loofah (~> 2.21)
282282
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)
283283
railties (8.1.1)
@@ -297,7 +297,7 @@ GEM
297297
rbs (4.0.0.dev.4)
298298
logger
299299
prism (>= 1.3.0)
300-
rdoc (7.0.2)
300+
rdoc (7.0.3)
301301
erb
302302
psych (>= 4.0.0)
303303
tsort
@@ -386,7 +386,7 @@ GEM
386386
unicode-display_width (3.2.0)
387387
unicode-emoji (~> 4.1)
388388
unicode-emoji (4.1.0)
389-
uri (0.13.2)
389+
uri (1.1.1)
390390
useragent (0.16.11)
391391
webmock (3.26.1)
392392
addressable (>= 2.8.0)
@@ -401,7 +401,7 @@ GEM
401401
yard-sorbet (0.9.0)
402402
sorbet-runtime
403403
yard
404-
zeitwerk (2.7.3)
404+
zeitwerk (2.7.4)
405405
zlib (3.1.0)
406406

407407
PLATFORMS
File renamed without changes.
Lines changed: 38 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)