Skip to content

Commit f40e9a9

Browse files
echarpTrim
authored andcommitted
Upgrade unicorn, carrierwave and acts_as_list, remove coffee gem
1 parent de589ca commit f40e9a9

File tree

2 files changed

+22
-27
lines changed

2 files changed

+22
-27
lines changed

Gemfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ end
88
gem "rails", "~>7.1"
99

1010
gem "actionpack-page_caching"
11-
gem "acts_as_list", "~>0.4"
11+
gem "acts_as_list", "~>1.1"
1212
gem "ansi", "~>1.4", require: false
1313
gem "bitfields", "~>0.4"
1414
gem "bootsnap", "~>1.3", require: false
1515
gem "canable", "~>0.1"
16-
gem "carrierwave", "~>1.1"
16+
gem "carrierwave", "~>3.0"
1717
gem "devise", "~>4.3"
1818
gem "diff_match_patch", github: "nono/diff_match_patch-ruby", require: "diff_match_patch"
1919
gem "doorkeeper"
@@ -38,7 +38,6 @@ gem "state_machines-activerecord"
3838
# Gems used for assets
3939
assets = !%w(production alpha).include?(ENV['RAILS_ENV'])
4040
assets = true if ENV['RAILS_GROUPS'] == "assets"
41-
gem "coffee-rails", "~>4.1", require: assets
4241
gem "jquery-rails", "~>4.0", require: assets
4342
gem "normalize-rails", "~>8.0", require: assets
4443
gem "sass-rails", "~>5.0", require: assets
@@ -65,5 +64,5 @@ group :test do
6564
end
6665

6766
group :production, :alpha do
68-
gem "unicorn", "~>5.1"
67+
gem "unicorn", "~>6.1"
6968
end

Gemfile.lock

Lines changed: 19 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,8 @@ GEM
118118
minitest (>= 5.1)
119119
mutex_m
120120
tzinfo (~> 2.0)
121-
acts_as_list (0.9.19)
122-
activerecord (>= 3.0)
121+
acts_as_list (1.1.0)
122+
activerecord (>= 4.2)
123123
addressable (2.8.6)
124124
public_suffix (>= 2.0.2, < 6.0)
125125
annotate (3.2.0)
@@ -143,18 +143,13 @@ GEM
143143
builder (3.2.4)
144144
byebug (11.1.3)
145145
canable (0.3.0)
146-
carrierwave (1.3.4)
147-
activemodel (>= 4.0.0)
148-
activesupport (>= 4.0.0)
149-
mime-types (>= 1.16)
150-
ssrf_filter (~> 1.0, < 1.1.0)
151-
coffee-rails (4.2.2)
152-
coffee-script (>= 2.2.0)
153-
railties (>= 4.0.0)
154-
coffee-script (2.4.1)
155-
coffee-script-source
156-
execjs
157-
coffee-script-source (1.12.2)
146+
carrierwave (3.0.6)
147+
activemodel (>= 6.0.0)
148+
activesupport (>= 6.0.0)
149+
addressable (~> 2.6)
150+
image_processing (~> 1.1)
151+
marcel (~> 1.0.0)
152+
ssrf_filter (~> 1.0)
158153
concurrent-ruby (1.2.3)
159154
connection_pool (2.4.1)
160155
crass (1.0.6)
@@ -192,6 +187,9 @@ GEM
192187
htmlentities (4.3.4)
193188
i18n (1.14.4)
194189
concurrent-ruby (~> 1.0)
190+
image_processing (1.12.2)
191+
mini_magick (>= 4.9.5, < 5)
192+
ruby-vips (>= 2.0.17, < 3)
195193
inherited_resources (1.14.0)
196194
actionpack (>= 6.0)
197195
has_scope (>= 0.6)
@@ -231,9 +229,6 @@ GEM
231229
net-pop
232230
net-smtp
233231
marcel (1.0.4)
234-
mime-types (3.5.2)
235-
mime-types-data (~> 3.2015)
236-
mime-types-data (3.2024.0305)
237232
mini_magick (4.12.0)
238233
mini_mime (1.1.5)
239234
minitest (5.22.2)
@@ -322,6 +317,8 @@ GEM
322317
railties (>= 5.2)
323318
rinku (2.0.6)
324319
rouge (4.2.0)
320+
ruby-vips (2.2.1)
321+
ffi (~> 1.12)
325322
sanitize (5.2.3)
326323
crass (~> 1.0.2)
327324
nokogiri (>= 1.8.0)
@@ -352,7 +349,7 @@ GEM
352349
actionpack (>= 5.2)
353350
activesupport (>= 5.2)
354351
sprockets (>= 3.0.0)
355-
ssrf_filter (1.0.8)
352+
ssrf_filter (1.1.2)
356353
state_machines (0.6.0)
357354
state_machines-activemodel (0.9.0)
358355
activemodel (>= 6.0)
@@ -369,7 +366,7 @@ GEM
369366
concurrent-ruby (~> 1.0)
370367
uglifier (4.2.0)
371368
execjs (>= 0.3.0, < 3)
372-
unicorn (5.8.0)
369+
unicorn (6.1.0)
373370
kgio (~> 2.6)
374371
raindrops (~> 0.7)
375372
warden (1.2.9)
@@ -390,7 +387,7 @@ PLATFORMS
390387

391388
DEPENDENCIES
392389
actionpack-page_caching
393-
acts_as_list (~> 0.4)
390+
acts_as_list (~> 1.1)
394391
annotate
395392
ansi (~> 1.4)
396393
better_errors
@@ -399,8 +396,7 @@ DEPENDENCIES
399396
bootsnap (~> 1.3)
400397
byebug
401398
canable (~> 0.1)
402-
carrierwave (~> 1.1)
403-
coffee-rails (~> 4.1)
399+
carrierwave (~> 3.0)
404400
devise (~> 4.3)
405401
diff_match_patch!
406402
doorkeeper
@@ -431,7 +427,7 @@ DEPENDENCIES
431427
spring
432428
state_machines-activerecord
433429
uglifier
434-
unicorn (~> 5.1)
430+
unicorn (~> 6.1)
435431
web-console
436432

437433
BUNDLED WITH

0 commit comments

Comments
 (0)