Skip to content

Commit b7a5c9e

Browse files
authored
Merge pull request #2107 from larouxn/update_active_support_dependency
Upgrade ActiveSupport from 7.0.8 to 7.1.2
2 parents 867d899 + b633af5 commit b7a5c9e

2 files changed

Lines changed: 14 additions & 4 deletions

File tree

Gemfile.lock

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,31 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activesupport (7.0.8)
4+
activesupport (7.1.2)
5+
base64
6+
bigdecimal
57
concurrent-ruby (~> 1.0, >= 1.0.2)
8+
connection_pool (>= 2.2.5)
9+
drb
610
i18n (>= 1.6, < 2)
711
minitest (>= 5.1)
12+
mutex_m
813
tzinfo (~> 2.0)
14+
base64 (0.2.0)
915
better_errors (2.10.1)
1016
erubi (>= 1.0.0)
1117
rack (>= 0.9.0)
1218
rouge (>= 1.0.0)
19+
bigdecimal (3.1.5)
1320
browser (5.3.1)
1421
byebug (11.1.3)
1522
chunky_png (1.4.0)
1623
coderay (1.1.3)
17-
concurrent-ruby (1.1.10)
24+
concurrent-ruby (1.2.2)
25+
connection_pool (2.4.1)
1826
daemons (1.4.1)
27+
drb (2.2.0)
28+
ruby2_keywords
1929
erubi (1.12.0)
2030
ethon (0.16.0)
2131
ffi (>= 1.15.0)
@@ -28,7 +38,7 @@ GEM
2838
html-pipeline (2.14.3)
2939
activesupport (>= 2)
3040
nokogiri (>= 1.4)
31-
i18n (1.12.0)
41+
i18n (1.14.1)
3242
concurrent-ruby (~> 1.0)
3343
image_optim (0.31.3)
3444
exifr (~> 1.2, >= 1.2.2)
@@ -47,6 +57,7 @@ GEM
4757
multi_json (1.15.0)
4858
mustermann (3.0.0)
4959
ruby2_keywords (~> 0.0.1)
60+
mutex_m (0.2.0)
5061
net-sftp (4.0.0)
5162
net-ssh (>= 5.0.0, < 8.0.0)
5263
net-ssh (7.0.1)

lib/app.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ class App < Sinatra::Application
5656

5757
SpritesCLI.new.invoke(:generate, [], :disable_optimization => true)
5858

59-
require 'active_support/per_thread_registry'
6059
require 'active_support/cache'
6160
sprockets.cache = ActiveSupport::Cache.lookup_store :file_store, root.join('tmp', 'cache', 'assets', environment.to_s)
6261
end

0 commit comments

Comments
 (0)