Skip to content

Commit 7773c60

Browse files
authored
Merge pull request #54 from brunoluigi/dependabot/bundler/tailwind_merge-1.3.1
Bump tailwind_merge from 1.2.0 to 1.3.1
2 parents fd52231 + f854567 commit 7773c60

File tree

2 files changed

+24
-24
lines changed

2 files changed

+24
-24
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ gem "tailwindcss-rails", "~> 4.3.0"
2020
gem "jbuilder", "~> 2.13.0"
2121

2222
gem "phlex-rails", "~> 2.3.1"
23-
gem "tailwind_merge", "~> 1.2.0"
23+
gem "tailwind_merge", "~> 1.3.1"
2424

2525
# Use Active Model has_secure_password [https://guides.rubyonrails.org/active_model_basics.html#securepassword]
2626
gem "bcrypt", "~> 3.1.20"

Gemfile.lock

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,11 @@ GEM
7575
addressable (2.8.7)
7676
public_suffix (>= 2.0.2, < 7.0)
7777
ast (2.4.3)
78-
base64 (0.3.0)
78+
base64 (0.2.0)
7979
bcrypt (3.1.20)
8080
bcrypt_pbkdf (1.1.1)
81-
benchmark (0.4.1)
82-
bigdecimal (3.3.1)
81+
benchmark (0.4.0)
82+
bigdecimal (3.1.9)
8383
bindex (0.8.1)
8484
bootsnap (1.18.6)
8585
msgpack (~> 1.2)
@@ -97,14 +97,14 @@ GEM
9797
xpath (~> 3.2)
9898
chunky_png (1.4.0)
9999
concurrent-ruby (1.3.5)
100-
connection_pool (2.5.4)
100+
connection_pool (2.5.3)
101101
crass (1.0.6)
102102
date (3.4.1)
103103
debug (1.11.0)
104104
irb (~> 1.10)
105105
reline (>= 0.3.8)
106106
dotenv (3.1.8)
107-
drb (2.2.3)
107+
drb (2.2.1)
108108
ed25519 (1.4.0)
109109
erb (5.0.1)
110110
erubi (1.13.1)
@@ -155,7 +155,7 @@ GEM
155155
marcel (1.0.4)
156156
matrix (0.4.2)
157157
mini_mime (1.1.5)
158-
minitest (5.26.0)
158+
minitest (5.25.5)
159159
msgpack (1.8.0)
160160
net-imap (0.5.8)
161161
date
@@ -186,7 +186,7 @@ GEM
186186
racc (~> 1.4)
187187
nokogiri (1.18.8-x86_64-linux-musl)
188188
racc (~> 1.4)
189-
ostruct (0.6.3)
189+
ostruct (0.6.1)
190190
parallel (1.27.0)
191191
parser (3.3.8.0)
192192
ast (~> 2.4.1)
@@ -216,7 +216,7 @@ GEM
216216
nio4r (~> 2.0)
217217
raabro (1.4.0)
218218
racc (1.8.1)
219-
rack (3.1.16)
219+
rack (3.1.15)
220220
rack-session (2.1.1)
221221
base64 (>= 0.1.0)
222222
rack (>= 3.0.0)
@@ -238,7 +238,7 @@ GEM
238238
activesupport (= 8.0.2)
239239
bundler (>= 1.15.0)
240240
railties (= 8.0.2)
241-
rails-dom-testing (2.3.0)
241+
rails-dom-testing (2.2.0)
242242
activesupport (>= 5.0.0)
243243
minitest
244244
nokogiri (>= 1.6)
@@ -254,16 +254,16 @@ GEM
254254
thor (~> 1.0, >= 1.2.2)
255255
zeitwerk (~> 2.6)
256256
rainbow (3.1.1)
257-
rake (13.3.0)
257+
rake (13.2.1)
258258
rbs (3.9.4)
259259
logger
260-
rdoc (6.14.2)
260+
rdoc (6.14.0)
261261
erb
262262
psych (>= 4.0.0)
263263
regexp_parser (2.10.0)
264264
reline (0.6.1)
265265
io-console (~> 0.5)
266-
rexml (3.4.4)
266+
rexml (3.4.1)
267267
rqrcode (3.1.0)
268268
chunky_png (~> 1.0)
269269
rqrcode_core (~> 2.0)
@@ -307,7 +307,7 @@ GEM
307307
ruby-lsp (~> 0.23.19)
308308
ruby-progressbar (1.13.0)
309309
ruby_ui (1.0.1)
310-
rubyzip (3.2.0)
310+
rubyzip (2.4.1)
311311
securerandom (0.4.1)
312312
selenium-webdriver (4.37.0)
313313
base64 (~> 0.2)
@@ -332,7 +332,7 @@ GEM
332332
fugit (~> 1.11.0)
333333
railties (>= 7.1)
334334
thor (~> 1.3.1)
335-
sorbet-runtime (0.5.12155)
335+
sorbet-runtime (0.5.12149)
336336
sshkit (1.24.0)
337337
base64
338338
logger
@@ -345,17 +345,17 @@ GEM
345345
stringio (3.1.7)
346346
syntax_tree (6.2.0)
347347
prettier_print (>= 1.2.0)
348-
tailwind_merge (1.2.0)
348+
tailwind_merge (1.3.1)
349349
sin_lru_redux (~> 2.5)
350350
tailwindcss-rails (4.3.0)
351351
railties (>= 7.0.0)
352352
tailwindcss-ruby (~> 4.0)
353-
tailwindcss-ruby (4.1.11)
354-
tailwindcss-ruby (4.1.11-aarch64-linux-gnu)
355-
tailwindcss-ruby (4.1.11-aarch64-linux-musl)
356-
tailwindcss-ruby (4.1.11-arm64-darwin)
357-
tailwindcss-ruby (4.1.11-x86_64-linux-gnu)
358-
tailwindcss-ruby (4.1.11-x86_64-linux-musl)
353+
tailwindcss-ruby (4.1.7)
354+
tailwindcss-ruby (4.1.7-aarch64-linux-gnu)
355+
tailwindcss-ruby (4.1.7-aarch64-linux-musl)
356+
tailwindcss-ruby (4.1.7-arm64-darwin)
357+
tailwindcss-ruby (4.1.7-x86_64-linux-gnu)
358+
tailwindcss-ruby (4.1.7-x86_64-linux-musl)
359359
thor (1.3.2)
360360
thruster (0.1.13)
361361
thruster (0.1.13-aarch64-linux)
@@ -370,7 +370,7 @@ GEM
370370
unicode-display_width (3.1.4)
371371
unicode-emoji (~> 4.0, >= 4.0.4)
372372
unicode-emoji (4.0.4)
373-
uri (1.0.4)
373+
uri (1.0.3)
374374
useragent (0.16.11)
375375
web-console (4.2.1)
376376
actionview (>= 6.0.0)
@@ -423,7 +423,7 @@ DEPENDENCIES
423423
solid_queue (~> 1.1.5)
424424
stimulus-rails (~> 1.3.4)
425425
syntax_tree (~> 6.2.0)
426-
tailwind_merge (~> 1.2.0)
426+
tailwind_merge (~> 1.3.1)
427427
tailwindcss-rails (~> 4.3.0)
428428
thruster (~> 0.1.13)
429429
turbo-rails (~> 2.0.13)

0 commit comments

Comments
 (0)