Skip to content

Commit b538523

Browse files
committed
#1698, update rack gem
1 parent 1e04c11 commit b538523

4 files changed

Lines changed: 35 additions & 31 deletions

File tree

Gemfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ gem 'activerecord-import'
99
gem 'pg'
1010
gem 'pg_advisory_lock', git: 'https://github.com/didww/pg_advisory_lock.git'
1111
gem 'pg_sql_caller', git: 'https://github.com/didww/pg_sql_caller.git'
12-
gem 'rack', ' ~> 2.2.6'
12+
gem 'rack'
1313
gem 'rails', '~> 7.2.0'
1414
gem 'responders'
1515

@@ -69,7 +69,6 @@ gem 'jquery-tablesorter'
6969
gem 'jquery-ui-rails', github: 'jquery-ui-rails/jquery-ui-rails', tag: 'v7.0.0'
7070
gem 'mini_racer'
7171
gem 'rails-html-sanitizer', '>= 1.6.1'
72-
gem 'sass-globbing'
7372
gem 'uglifier', '>= 1.3'
7473

7574
# Server Tools

Gemfile.lock

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ GEM
258258
coffee-script-source
259259
execjs
260260
coffee-script-source (1.12.2)
261-
concurrent-ruby (1.3.4)
261+
concurrent-ruby (1.3.5)
262262
config (5.5.2)
263263
deep_merge (~> 1.2, >= 1.2.1)
264264
ostruct
@@ -278,10 +278,10 @@ GEM
278278
d3-rails (3.5.2)
279279
railties (>= 3.1)
280280
daemons (1.2.6)
281-
database_consistency (1.7.21)
281+
database_consistency (2.0.4)
282282
activerecord (>= 3.2)
283283
date (3.4.1)
284-
deep_merge (1.2.1)
284+
deep_merge (1.2.2)
285285
delayed_job (4.1.13)
286286
activesupport (>= 3.0, < 9.0)
287287
delayed_job_active_record (4.1.11)
@@ -383,7 +383,7 @@ GEM
383383
httparty (0.21.0)
384384
mini_mime (>= 1.0.0)
385385
multi_xml (>= 0.5.2)
386-
i18n (1.14.6)
386+
i18n (1.14.7)
387387
concurrent-ruby (~> 1.0)
388388
inherited_resources (1.14.0)
389389
actionpack (>= 6.0)
@@ -426,7 +426,7 @@ GEM
426426
rb-fsevent (~> 0.10, >= 0.10.3)
427427
rb-inotify (~> 0.9, >= 0.9.10)
428428
locale (2.1.2)
429-
logger (1.6.5)
429+
logger (1.6.6)
430430
loofah (2.23.1)
431431
crass (~> 1.0.2)
432432
nokogiri (>= 1.12.0)
@@ -682,14 +682,14 @@ GEM
682682
activesupport (>= 3.0.0)
683683
raabro (1.4.0)
684684
racc (1.8.1)
685-
rack (2.2.11)
686-
rack-session (1.0.2)
687-
rack (< 3)
685+
rack (3.1.10)
686+
rack-session (2.1.0)
687+
base64 (>= 0.1.0)
688+
rack (>= 3.0.0)
688689
rack-test (2.1.0)
689690
rack (>= 1.3)
690-
rackup (1.0.1)
691-
rack (< 3)
692-
webrick
691+
rackup (2.2.1)
692+
rack (>= 3)
693693
rails (7.2.2.1)
694694
actioncable (= 7.2.2.1)
695695
actionmailbox (= 7.2.2.1)
@@ -789,15 +789,16 @@ GEM
789789
rubyzip (1.3.0)
790790
rufus-scheduler (3.7.0)
791791
fugit (~> 1.1, >= 1.1.6)
792-
sass (3.4.25)
793-
sass-globbing (1.1.5)
794-
sass (>= 3.1)
795-
sass-rails (5.0.8)
796-
railties (>= 5.2.0)
797-
sass (~> 3.1)
798-
sprockets (>= 2.8, < 4.0)
799-
sprockets-rails (>= 2.0, < 4.0)
800-
tilt (>= 1.1, < 3)
792+
sass-rails (6.0.0)
793+
sassc-rails (~> 2.1, >= 2.1.1)
794+
sassc (2.4.0)
795+
ffi (~> 1.9)
796+
sassc-rails (2.1.2)
797+
railties (>= 4.0.0)
798+
sassc (>= 2.0)
799+
sprockets (> 3.0)
800+
sprockets-rails
801+
tilt
801802
securerandom (0.4.1)
802803
selenium-webdriver (3.141.0)
803804
childprocess (~> 0.5)
@@ -825,9 +826,9 @@ GEM
825826
simplecov_json_formatter (0.1.4)
826827
spreadsheet (1.3.0)
827828
ruby-ole
828-
sprockets (3.7.2)
829+
sprockets (4.2.1)
829830
concurrent-ruby (~> 1.0)
830-
rack (> 1, < 3)
831+
rack (>= 2.2.4, < 4)
831832
sprockets-rails (3.4.2)
832833
actionpack (>= 5.2)
833834
activesupport (>= 5.2)
@@ -836,10 +837,10 @@ GEM
836837
syslog (0.2.0)
837838
syslog-logger (1.6.8)
838839
text (1.3.1)
839-
thin (1.8.2)
840-
daemons (~> 1.0, >= 1.0.9)
841-
eventmachine (~> 1.0, >= 1.0.4)
842-
rack (>= 1, < 3)
840+
thin (1.6.2)
841+
daemons (>= 1.0.9)
842+
eventmachine (>= 1.0.0)
843+
rack (>= 1.0.0)
843844
thor (1.2.2)
844845
tilt (2.0.9)
845846
timeliness (0.4.5)
@@ -947,7 +948,7 @@ DEPENDENCIES
947948
puma (~> 6.1)
948949
puma_worker_killer
949950
pundit
950-
rack (~> 2.2.6)
951+
rack
951952
rails (~> 7.2.0)
952953
rails-html-sanitizer (>= 1.6.1)
953954
ransack
@@ -959,7 +960,6 @@ DEPENDENCIES
959960
rubocop-rails
960961
rubocop-rspec
961962
rufus-scheduler
962-
sass-globbing
963963
sass-rails
964964
selenium-webdriver
965965
sentry-delayed_job

app/assets/config/manifest.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
//= link active_admin
2+
//= link_tree ../images
3+
//= link_tree ../stylesheets
4+
//= link_tree ../javascripts

config/initializers/assets.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,5 @@
1313
# folder are already added.
1414
# Rails.application.config.assets.precompile += %w( admin.js admin.css )
1515
Rails.application.config.assets.precompile += %w[yeti/*]
16-
Rails.application.config.assets.precompile << /\.(?:svg|eot|woff|ttf)\z/
16+
Rails.application.config.assets.precompile += %w[.svg .eot .woff .ttf]
17+

0 commit comments

Comments
 (0)