diff --git a/.ruby-version b/.ruby-version index 1f7da99d..eca690e7 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.7.7 +3.0.5 diff --git a/.tool-versions b/.tool-versions index 6695f9c4..0460681a 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,2 +1,2 @@ -ruby 2.7.7 +ruby 3.0.5 nodejs 16.18.1 diff --git a/Gemfile b/Gemfile index cb5ae848..740b96b6 100644 --- a/Gemfile +++ b/Gemfile @@ -3,8 +3,8 @@ source 'https://rubygems.org' ruby File.read(File.expand_path '../.ruby-version', __FILE__).strip.sub /\-p[0-9]+$/, '' # Read the rbenv version file gem 'rails', '~> 6.0', '>= 6.0.6.1' -gem 'puma', '~> 4.3' -gem 'pg', '~> 1.2', '>= 1.2.3' +gem 'puma', '~> 6' +gem 'pg', '~> 1.5', '>= 1.2.3' gem 'barnes' # users @@ -18,7 +18,7 @@ gem 'addressable' # better URI checking gem 'combined_time_select' gem 'jekyll-timeago' -gem "rails-html-sanitizer", "~> 1.4.4" +gem "rails-html-sanitizer", "~> 1.6" # email parsing gem 'email_reply_trimmer' @@ -30,10 +30,10 @@ gem 'mailgun_rails' gem "ruby-openai" gem 'groupdate' # Admin Stats -gem 'rack-utf8_sanitizer', '~> 1.7' +gem 'rack-utf8_sanitizer', '~> 1.8' gem 'randomized_field', '~> 1.0' # builds user_keys gem 'rest-client' # RESTClient -gem 'rubyzip', '~> 1.3' +gem 'rubyzip', '~> 2' gem 'summernote-rails', '~> 0.8.20.0', git: "https://github.com/parterburn/summernote-rails" gem 'words_counted' # Year in Review gem 'zip-zip' diff --git a/Gemfile.lock b/Gemfile.lock index 67e70fdd..819a07e7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,60 +9,60 @@ GIT GEM remote: https://rubygems.org/ specs: - actioncable (6.1.7.2) - actionpack (= 6.1.7.2) - activesupport (= 6.1.7.2) + actioncable (6.1.7.3) + actionpack (= 6.1.7.3) + activesupport (= 6.1.7.3) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.1.7.2) - actionpack (= 6.1.7.2) - activejob (= 6.1.7.2) - activerecord (= 6.1.7.2) - activestorage (= 6.1.7.2) - activesupport (= 6.1.7.2) + actionmailbox (6.1.7.3) + actionpack (= 6.1.7.3) + activejob (= 6.1.7.3) + activerecord (= 6.1.7.3) + activestorage (= 6.1.7.3) + activesupport (= 6.1.7.3) mail (>= 2.7.1) - actionmailer (6.1.7.2) - actionpack (= 6.1.7.2) - actionview (= 6.1.7.2) - activejob (= 6.1.7.2) - activesupport (= 6.1.7.2) + actionmailer (6.1.7.3) + actionpack (= 6.1.7.3) + actionview (= 6.1.7.3) + activejob (= 6.1.7.3) + activesupport (= 6.1.7.3) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.1.7.2) - actionview (= 6.1.7.2) - activesupport (= 6.1.7.2) + actionpack (6.1.7.3) + actionview (= 6.1.7.3) + activesupport (= 6.1.7.3) rack (~> 2.0, >= 2.0.9) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.1.7.2) - actionpack (= 6.1.7.2) - activerecord (= 6.1.7.2) - activestorage (= 6.1.7.2) - activesupport (= 6.1.7.2) + actiontext (6.1.7.3) + actionpack (= 6.1.7.3) + activerecord (= 6.1.7.3) + activestorage (= 6.1.7.3) + activesupport (= 6.1.7.3) nokogiri (>= 1.8.5) - actionview (6.1.7.2) - activesupport (= 6.1.7.2) + actionview (6.1.7.3) + activesupport (= 6.1.7.3) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.1.7.2) - activesupport (= 6.1.7.2) + activejob (6.1.7.3) + activesupport (= 6.1.7.3) globalid (>= 0.3.6) - activemodel (6.1.7.2) - activesupport (= 6.1.7.2) - activerecord (6.1.7.2) - activemodel (= 6.1.7.2) - activesupport (= 6.1.7.2) - activestorage (6.1.7.2) - actionpack (= 6.1.7.2) - activejob (= 6.1.7.2) - activerecord (= 6.1.7.2) - activesupport (= 6.1.7.2) + activemodel (6.1.7.3) + activesupport (= 6.1.7.3) + activerecord (6.1.7.3) + activemodel (= 6.1.7.3) + activesupport (= 6.1.7.3) + activestorage (6.1.7.3) + actionpack (= 6.1.7.3) + activejob (= 6.1.7.3) + activerecord (= 6.1.7.3) + activesupport (= 6.1.7.3) marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (6.1.7.2) + activesupport (6.1.7.3) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -76,7 +76,7 @@ GEM barnes (0.0.9) multi_json (~> 1) statsd-ruby (~> 1.1) - bcrypt (3.1.16) + bcrypt (3.1.18) benchmark-ips (2.9.2) better_errors (2.9.1) coderay (>= 1.0.0) @@ -107,7 +107,7 @@ GEM mini_mime (>= 0.1.3) ssrf_filter (~> 1.0) charlock_holmes (0.7.7) - chartkick (5.0.1) + chartkick (5.0.2) childprocess (3.0.0) chronic (0.10.2) cloudflare-rails (3.0.0) @@ -139,7 +139,7 @@ GEM rake (> 10, < 14) ruby-statistics (>= 2.1) thor (>= 0.19, < 2) - devise (4.9.0) + devise (4.9.2) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0) @@ -169,6 +169,8 @@ GEM faraday (2.2.0) faraday-net_http (~> 2.0) ruby2_keywords (>= 0.0.4) + faraday-multipart (1.0.4) + multipart-post (~> 2) faraday-net_http (2.0.1) fastimage (2.1.7) ffi (1.15.5) @@ -196,7 +198,7 @@ GEM gibbon (3.4.4) faraday (>= 1.0) multi_json (>= 1.11.0) - globalid (1.0.0) + globalid (1.1.0) activesupport (>= 5.0) google-analytics-rails (1.1.1) griddler (1.5.2) @@ -217,10 +219,7 @@ GEM http-accept (1.7.0) http-cookie (1.0.3) domain_name (~> 0.5) - httparty (0.21.0) - mini_mime (>= 1.0.0) - multi_xml (>= 0.5.2) - i18n (1.12.0) + i18n (1.14.0) concurrent-ruby (~> 1.0) i18n-js (3.6.0) i18n (>= 0.6.6) @@ -262,9 +261,9 @@ GEM logtail (~> 0.1) logtail-rack (~> 0.1) railties (>= 3.0.0) - loofah (2.19.1) + loofah (2.21.3) crass (~> 1.0.2) - nokogiri (>= 1.5.9) + nokogiri (>= 1.12.0) mail (2.8.1) mini_mime (>= 0.1.1) net-imap @@ -288,11 +287,11 @@ GEM mini_i18n (0.8.0) mini_magick (4.11.0) mini_mime (1.1.2) - mini_portile2 (2.8.1) - minitest (5.17.0) + mini_portile2 (2.8.2) + minitest (5.18.0) msgpack (1.6.0) multi_json (1.15.0) - multi_xml (0.6.0) + multipart-post (2.3.0) net-imap (0.3.4) date net-protocol @@ -303,51 +302,52 @@ GEM net-smtp (0.3.3) net-protocol netrc (0.11.0) - nio4r (2.5.8) - nokogiri (1.14.2) - mini_portile2 (~> 2.8.0) + nio4r (2.5.9) + nokogiri (1.15.2) + mini_portile2 (~> 2.8.2) racc (~> 1.4) orm_adapter (0.5.0) - pg (1.2.3) + pg (1.5.3) public_suffix (4.0.6) - puma (4.3.12) + puma (6.3.0) nio4r (~> 2.0) racc (1.6.2) - rack (2.2.6.2) + rack (2.2.7) rack-affiliates (0.4.0) rack - rack-attack (6.6.0) + rack-attack (6.6.1) rack (>= 1.0, < 3) rack-contrib (2.2.0) rack (~> 2.0) - rack-test (2.0.2) + rack-test (2.1.0) rack (>= 1.3) rack-timeout (0.6.0) - rack-utf8_sanitizer (1.7.0) - rack (>= 1.0, < 3.0) - rails (6.1.7.2) - actioncable (= 6.1.7.2) - actionmailbox (= 6.1.7.2) - actionmailer (= 6.1.7.2) - actionpack (= 6.1.7.2) - actiontext (= 6.1.7.2) - actionview (= 6.1.7.2) - activejob (= 6.1.7.2) - activemodel (= 6.1.7.2) - activerecord (= 6.1.7.2) - activestorage (= 6.1.7.2) - activesupport (= 6.1.7.2) + rack-utf8_sanitizer (1.8.0) + rack (>= 1.0, < 4.0) + rails (6.1.7.3) + actioncable (= 6.1.7.3) + actionmailbox (= 6.1.7.3) + actionmailer (= 6.1.7.3) + actionpack (= 6.1.7.3) + actiontext (= 6.1.7.3) + actionview (= 6.1.7.3) + activejob (= 6.1.7.3) + activemodel (= 6.1.7.3) + activerecord (= 6.1.7.3) + activestorage (= 6.1.7.3) + activesupport (= 6.1.7.3) bundler (>= 1.15.0) - railties (= 6.1.7.2) + railties (= 6.1.7.3) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.4.4) - loofah (~> 2.19, >= 2.19.1) - railties (6.1.7.2) - actionpack (= 6.1.7.2) - activesupport (= 6.1.7.2) + rails-html-sanitizer (1.6.0) + loofah (~> 2.21) + nokogiri (~> 1.14) + railties (6.1.7.3) + actionpack (= 6.1.7.3) + activesupport (= 6.1.7.3) method_source rake (>= 12.2) thor (~> 1.0) @@ -391,13 +391,14 @@ GEM rspec-mocks (~> 3.10) rspec-support (~> 3.10) rspec-support (3.10.2) - ruby-openai (3.7.0) - httparty (>= 0.18.1) + ruby-openai (4.1.0) + faraday (>= 1) + faraday-multipart (>= 1) ruby-statistics (3.0.0) ruby-vips (2.1.4) ffi (~> 1.12) ruby2_keywords (0.0.5) - rubyzip (1.3.0) + rubyzip (2.3.2) safe_yaml (1.0.5) sass-rails (6.0.0) sassc-rails (~> 2.1, >= 2.1.1) @@ -417,16 +418,18 @@ GEM sentry-ruby (~> 5.9.0) sentry-ruby (5.9.0) concurrent-ruby (~> 1.0, >= 1.0.2) - simplecov (0.18.5) + simplecov (0.22.0) docile (~> 1.1) simplecov-html (~> 0.11) - simplecov-html (0.12.2) + simplecov_json_formatter (~> 0.1) + simplecov-html (0.12.3) + simplecov_json_formatter (0.1.4) spring (2.1.0) spring-commands-rspec (1.0.4) spring (>= 0.9.1) - sprockets (4.1.1) + sprockets (4.2.0) concurrent-ruby (~> 1.0) - rack (> 1, < 3) + rack (>= 2.2.4, < 4) sprockets-rails (3.4.2) actionpack (>= 5.2) activesupport (>= 5.2) @@ -440,7 +443,7 @@ GEM activesupport (>= 3.1) stripe (>= 2.8, < 9) temple (0.8.2) - thor (1.2.1) + thor (1.2.2) tilt (2.0.10) timeout (0.3.2) turnstile-captcha (0.1.4) @@ -471,7 +474,7 @@ GEM words_counted (1.0.2) xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.6.7) + zeitwerk (2.6.8) zip-zip (0.3) rubyzip (>= 1.0.0) @@ -521,14 +524,14 @@ DEPENDENCIES mailgun_rails meta_request mini_magick - pg (~> 1.2, >= 1.2.3) - puma (~> 4.3) + pg (~> 1.5, >= 1.2.3) + puma (~> 6) rack-affiliates rack-attack rack-timeout - rack-utf8_sanitizer (~> 1.7) + rack-utf8_sanitizer (~> 1.8) rails (~> 6.0, >= 6.0.6.1) - rails-html-sanitizer (~> 1.4.4) + rails-html-sanitizer (~> 1.6) randomized_field (~> 1.0) redcarpet rest-client @@ -537,7 +540,7 @@ DEPENDENCIES rspec (~> 3.10) rspec-rails ruby-openai - rubyzip (~> 1.3) + rubyzip (~> 2) sass-rails selenium-webdriver sentry-rails (~> 5.9) @@ -559,7 +562,7 @@ DEPENDENCIES zip-zip RUBY VERSION - ruby 2.7.7p221 + ruby 3.0.5p211 BUNDLED WITH - 2.3.26 + 2.4.7